Commit6395898

authored

refactor: use associatedv8::Context for event setup (electron#37355)

refactor: use associated v8::Context for event setup

1 parent32c60b2 commit6395898Copy full SHA for 6395898

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ void ElectronBrowserMainParts::PostEarlyInitialization() {`
`270`	`270`
`271`	`271`	`v8::HandleScopescope(js_env_->isolate());`
`272`	`272`
`273`		`- node_bindings_->Initialize();`
	`273`	`+ node_bindings_->Initialize(js_env_->isolate()->GetCurrentContext());`
`274`	`274`	`// Create the global environment.`
`275`	`275`	`node::Environment* env = node_bindings_->CreateEnvironment(`
`276`	`276`	`js_env_->isolate()->GetCurrentContext(), js_env_->platform());`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ void NodeBindings::SetNodeCliFlags() {`
`415`	`415`	`}`
`416`	`416`	`}`
`417`	`417`
`418`		`-voidNodeBindings::Initialize() {`
	`418`	`+voidNodeBindings::Initialize(v8::Local<v8::Context> context) {`
`419`	`419`	`TRACE_EVENT0("electron","NodeBindings::Initialize");`
`420`	`420`	`// Open node's error reporting system for browser process.`
`421`	`421`
`@@ -463,8 +463,7 @@ void NodeBindings::Initialize() {`
`463`	`463`	`SetErrorMode(GetErrorMode() & ~SEM_NOGPFAULTERRORBOX);`
`464`	`464`	`#endif`
`465`	`465`
`466`		`- v8::Isolate* isolate =v8::Isolate::GetCurrent();`
`467`		`-gin_helper::internal::Event::GetConstructor(isolate->GetCurrentContext());`
	`466`	`+gin_helper::internal::Event::GetConstructor(context);`
`468`	`467`
`469`	`468`	`g_is_initialized =true;`
`470`	`469`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ class NodeBindings {`
`85`	`85`	`virtual~NodeBindings();`
`86`	`86`
`87`	`87`	`// Setup V8, libuv.`
`88`		`-voidInitialize();`
	`88`	`+voidInitialize(v8::Local<v8::Context> context);`
`89`	`89`
`90`	`90`	`voidSetNodeCliFlags();`
`91`	`91`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ void ElectronRendererClient::DidCreateScriptContext(`
`76`	`76`
`77`	`77`	`if (!node_integration_initialized_) {`
`78`	`78`	`node_integration_initialized_ =true;`
`79`		`- node_bindings_->Initialize();`
	`79`	`+ node_bindings_->Initialize(renderer_context);`
`80`	`80`	`node_bindings_->PrepareEmbedThread();`
`81`	`81`	`}`
`82`	`82`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void NodeService::Initialize(node::mojom::NodeServiceParamsPtr params) {`
`47`	`47`
`48`	`48`	`v8::HandleScopescope(js_env_->isolate());`
`49`	`49`
`50`		`- node_bindings_->Initialize();`
	`50`	`+ node_bindings_->Initialize(js_env_->isolate()->GetCurrentContext());`
`51`	`51`
`52`	`52`	`// Append program path for process.argv0`
`53`	`53`	`auto program =base::CommandLine::ForCurrentProcess()->GetProgram();`

Comments

(0)