chore: cleanup

electron · Jun 23, 2023 · 0aa9c0d · 0aa9c0d
1 parent f647864
commit 0aa9c0d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 39 deletions.
diff --git a/shell/renderer/electron_renderer_client.cc b/shell/renderer/electron_renderer_client.cc
@@ -31,30 +31,7 @@ ElectronRendererClient::ElectronRendererClient()
       electron_bindings_(
           std::make_unique<ElectronBindings>(node_bindings_->uv_loop())) {}
 
-ElectronRendererClient::~ElectronRendererClient() {
-  if (!env_)
-    return;
-
-  // Destroying the node environment will also run the uv loop,
-  // Node.js expects `kExplicit` microtasks policy and will run microtasks
-  // checkpoints after every call into JavaScript. Since we use a different
-  // policy in the renderer - switch to `kExplicit` and then drop back to the
-  // previous policy value.
-  v8::Local<v8::Context> context = env_->context();
-  v8::MicrotaskQueue* microtask_queue = context->GetMicrotaskQueue();
-  auto old_policy = microtask_queue->microtasks_policy();
-  DCHECK_EQ(microtask_queue->GetMicrotasksScopeDepth(), 0);
-  microtask_queue->set_microtasks_policy(v8::MicrotasksPolicy::kExplicit);
-
-  node::FreeEnvironment(env_);
-  node::FreeIsolateData(node_bindings_->isolate_data());
-  node_bindings_->set_isolate_data(nullptr);
-
-  microtask_queue->set_microtasks_policy(old_policy);
-
-  // ElectronBindings is tracking node environments.
-  electron_bindings_->EnvironmentDestroyed(env_);
-}
+ElectronRendererClient::~ElectronRendererClient() = default;
 
 void ElectronRendererClient::RenderFrameCreated(
     content::RenderFrame* render_frame) {
@@ -69,7 +46,7 @@ void ElectronRendererClient::RunScriptsAtDocumentStart(
   // Inform the document start phase.
   auto* isolate = v8::Isolate::GetCurrent();
   v8::HandleScope handle_scope(isolate);
-  node::Environment* env = GetEnvironment(render_frame, isolate);
+  node::Environment* env = GetEnvironment(render_frame);
   if (env)
     gin_helper::EmitEvent(isolate, env->process_object(), "document-start");
 }
@@ -81,7 +58,7 @@ void ElectronRendererClient::RunScriptsAtDocumentEnd(
   // Inform the document end phase.
   auto* isolate = v8::Isolate::GetCurrent();
   v8::HandleScope handle_scope(isolate);
-  node::Environment* env = GetEnvironment(render_frame, isolate);
+  node::Environment* env = GetEnvironment(render_frame);
   if (env)
     gin_helper::EmitEvent(isolate, env->process_object(), "document-end");
 }
@@ -147,13 +124,39 @@ void ElectronRendererClient::DidCreateScriptContext(
 void ElectronRendererClient::WillReleaseScriptContext(
     v8::Handle<v8::Context> context,
     content::RenderFrame* render_frame) {
-  auto* env = node::Environment::GetCurrent(context);
-  if (injected_frames_.erase(render_frame) == 0 || !env)
+  if (injected_frames_.erase(render_frame) == 0 || !env_)
     return;
 
   gin_helper::EmitEvent(env_->isolate(), env_->process_object(), "exit");
 
-  env->UntrackContext(context);
+  env_->UntrackContext(context);
+
+  // If the main frame script context is being released then
+  // destroy the node environment so the new navigation can create
+  // new environment associated with the main thread.
+  if (render_frame->IsMainFrame()) {
+    node_bindings_->set_uv_env(nullptr);
+    // Destroying the node environment will also run the uv loop,
+    // Node.js expects `kExplicit` microtasks policy and will run microtasks
+    // checkpoints after every call into JavaScript. Since we use a different
+    // policy in the renderer - switch to `kExplicit` and then drop back to the
+    // previous policy value.
+    v8::MicrotaskQueue* microtask_queue = context->GetMicrotaskQueue();
+    auto old_policy = microtask_queue->microtasks_policy();
+    DCHECK_EQ(microtask_queue->GetMicrotasksScopeDepth(), 0);
+    microtask_queue->set_microtasks_policy(v8::MicrotasksPolicy::kExplicit);
+
+    // ElectronBindings is tracking node environments.
+    electron_bindings_->EnvironmentDestroyed(env_);
+
+    node::FreeEnvironment(env_);
+    env_ = nullptr;
+
+    node::FreeIsolateData(node_bindings_->isolate_data());
+    node_bindings_->set_isolate_data(nullptr);
+
+    microtask_queue->set_microtasks_policy(old_policy);
+  }
 }
 
 void ElectronRendererClient::WorkerScriptReadyForEvaluationOnWorkerThread(
@@ -195,13 +198,11 @@ void ElectronRendererClient::WillDestroyWorkerContextOnWorkerThread(
 }
 
 node::Environment* ElectronRendererClient::GetEnvironment(
-    content::RenderFrame* render_frame,
-    v8::Isolate* isolate) const {
+    content::RenderFrame* render_frame) const {
   if (!base::Contains(injected_frames_, render_frame))
     return nullptr;
 
-  auto* env = node::Environment::GetCurrent(isolate);
-  return (env && env == env_) ? env : nullptr;
+  return env_;
 }
 
 }  // namespace electron
diff --git a/shell/renderer/electron_renderer_client.h b/shell/renderer/electron_renderer_client.h
@@ -44,8 +44,7 @@ class ElectronRendererClient : public RendererClientBase {
   void WillDestroyWorkerContextOnWorkerThread(
       v8::Local<v8::Context> context) override;
 
-  node::Environment* GetEnvironment(content::RenderFrame* frame,
-                                    v8::Isolate* isolate) const;
+  node::Environment* GetEnvironment(content::RenderFrame* frame) const;
 
   // Whether the node integration has been initialized.
   bool node_integration_initialized_ = false;
@@ -55,10 +54,8 @@ class ElectronRendererClient : public RendererClientBase {
 
   // The node::Environment::GetCurrent API does not return nullptr when it
   // is called for a context without node::Environment, so we have to keep
-  // a book of the environments created.
-  node::Environment* env_;
-
-  std::set<v8::Handle<v8::Context>> contexts_;
+  // a book of the environment created.
+  raw_ptr<node::Environment> env_ = nullptr;
 
   // Getting main script context from web frame would lazily initializes
   // its script context. Doing so in a web page without scripts would trigger