github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-09 23:48:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
5 changed files with 6 additions and 7 deletions
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());
node_bindings_->Initialize();
node_bindings_->Initialize(js_env_->isolate()->GetCurrentContext());
// Create the global environment.
node::Environment* env = node_bindings_->CreateEnvironment(
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");
// Open node's error reporting system for browser process.
@@ -463,8 +463,7 @@ void NodeBindings::Initialize() {
SetErrorMode(GetErrorMode() & ~SEM_NOGPFAULTERRORBOX);
#endif
v8::Isolate* isolate = v8::Isolate::GetCurrent();
gin_helper::internal::Event::GetConstructor(isolate->GetCurrentContext());
gin_helper::internal::Event::GetConstructor(context);
g_is_initialized = true;
}

2
shell/common/node_bindings.h
View File

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

2
shell/renderer/electron_renderer_client.cc
View File

@@ -76,7 +76,7 @@ void ElectronRendererClient::DidCreateScriptContext(
if (!node_integration_initialized_) {
node_integration_initialized_ = true;
node_bindings_->Initialize();
node_bindings_->Initialize(renderer_context);
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());
node_bindings_->Initialize();
node_bindings_->Initialize(js_env_->isolate()->GetCurrentContext());
// Append program path for process.argv0
auto program = base::CommandLine::ForCurrentProcess()->GetProgram();