mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: use associated v8::Context for event setup (#37355)

Browse source 
refactor: use associated v8::Context for event setup
This commit is contained in:
Shelley Vohr 2023-02-22 10:03:46 +01:00 committed by GitHub
parent 32c60b29bb
commit 6395898a79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/electron_browser_main_parts.cc
View file

@ -270,7 +270,7 @@ void ElectronBrowserMainParts::PostEarlyInitialization() {
v8::HandleScope scope(js_env_->isolate()); v8::HandleScope scope(js_env_->isolate());
node_bindings_->Initialize(); node_bindings_->Initialize(js_env_->isolate()->GetCurrentContext());
// Create the global environment. // Create the global environment.
node::Environment* env = node_bindings_->CreateEnvironment( node::Environment* env = node_bindings_->CreateEnvironment(
js_env_->isolate()->GetCurrentContext(), js_env_->platform()); js_env_->isolate()->GetCurrentContext(), js_env_->platform());

5
shell/common/node_bindings.cc
View file

@ -415,7 +415,7 @@ void NodeBindings::SetNodeCliFlags() {
} }
} }
void NodeBindings::Initialize() { void NodeBindings::Initialize(v8::Local<v8::Context> context) {
TRACE_EVENT0("electron", "NodeBindings::Initialize"); TRACE_EVENT0("electron", "NodeBindings::Initialize");
// Open node's error reporting system for browser process. // Open node's error reporting system for browser process.
@ -463,8 +463,7 @@ void NodeBindings::Initialize() {
SetErrorMode(GetErrorMode() & ~SEM_NOGPFAULTERRORBOX); SetErrorMode(GetErrorMode() & ~SEM_NOGPFAULTERRORBOX);
#endif #endif
v8::Isolate* isolate = v8::Isolate::GetCurrent(); gin_helper::internal::Event::GetConstructor(context);
gin_helper::internal::Event::GetConstructor(isolate->GetCurrentContext());
g_is_initialized = true; g_is_initialized = true;
} }

2
shell/common/node_bindings.h
View file

@ -85,7 +85,7 @@ class NodeBindings {
virtual ~NodeBindings(); virtual ~NodeBindings();
// Setup V8, libuv. // Setup V8, libuv.
void Initialize(); void Initialize(v8::Local<v8::Context> context);
void SetNodeCliFlags(); void SetNodeCliFlags();

2
shell/renderer/electron_renderer_client.cc
View file

@ -76,7 +76,7 @@ void ElectronRendererClient::DidCreateScriptContext(
if (!node_integration_initialized_) { if (!node_integration_initialized_) {
node_integration_initialized_ = true; node_integration_initialized_ = true;
node_bindings_->Initialize(); node_bindings_->Initialize(renderer_context);
node_bindings_->PrepareEmbedThread(); node_bindings_->PrepareEmbedThread();
} }

2
shell/services/node/node_service.cc
View file

@ -47,7 +47,7 @@ void NodeService::Initialize(node::mojom::NodeServiceParamsPtr params) {
v8::HandleScope scope(js_env_->isolate()); v8::HandleScope scope(js_env_->isolate());
node_bindings_->Initialize(); node_bindings_->Initialize(js_env_->isolate()->GetCurrentContext());
// Append program path for process.argv0 // Append program path for process.argv0
auto program = base::CommandLine::ForCurrentProcess()->GetProgram(); auto program = base::CommandLine::ForCurrentProcess()->GetProgram();