refactor: use public node::CallbackScope where possible (electron#27001)

codebytere · web-flow · commit b266b5208a40 · 2020-12-15T11:39:25.000-08:00
* refactor: use public node::CallbackScope where possible

* Remove unused node_env() getter
diff --git a/shell/browser/electron_browser_main_parts.h b/shell/browser/electron_browser_main_parts.h
@@ -89,7 +89,6 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
 
   Browser* browser() { return browser_.get(); }
   BrowserProcessImpl* browser_process() { return fake_browser_process_.get(); }
-  NodeEnvironment* node_env() { return node_env_.get(); }
 
  protected:
   // content::BrowserMainParts:
diff --git a/shell/browser/microtasks_runner.cc b/shell/browser/microtasks_runner.cc
@@ -29,11 +29,9 @@ void MicrotasksRunner::DidProcessTask(const base::PendingTask& pending_task) {
   // up Node.js dealying its callbacks. To fix this, now we always lets Node.js
   // handle the checkpoint in the browser process.
   {
-    auto* node_env = electron::ElectronBrowserMainParts::Get()->node_env();
     v8::HandleScope scope(isolate_);
-    node::InternalCallbackScope microtasks_scope(
-        node_env->env(), v8::Object::New(isolate_), {0, 0},
-        node::InternalCallbackScope::kNoFlags);
+    node::CallbackScope microtasks_scope(isolate_, v8::Object::New(isolate_),
+                                         {0, 0});
   }
 }
 
diff --git a/shell/common/api/electron_bindings.cc b/shell/common/api/electron_bindings.cc
@@ -113,9 +113,8 @@ void ElectronBindings::OnCallNextTick(uv_async_t* handle) {
     gin_helper::Locker locker(env->isolate());
     v8::Context::Scope context_scope(env->context());
     v8::HandleScope handle_scope(env->isolate());
-    node::InternalCallbackScope scope(env, v8::Object::New(env->isolate()),
-                                      {0, 0},
-                                      node::InternalCallbackScope::kNoFlags);
+    node::CallbackScope scope(env->isolate(), v8::Object::New(env->isolate()),
+                              {0, 0});
   }
 
   self->pending_next_ticks_.clear();

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,9 @@ void MicrotasksRunner::DidProcessTask(const base::PendingTask& pending_task) {`
`29`	`29`	`// up Node.js dealying its callbacks. To fix this, now we always lets Node.js`
`30`	`30`	`// handle the checkpoint in the browser process.`
`31`	`31`	`{`
`32`		`- auto* node_env = electron::ElectronBrowserMainParts::Get()->node_env();`
`33`	`32`	`v8::HandleScope scope(isolate_);`
`34`		`- node::InternalCallbackScope microtasks_scope(`
`35`		`- node_env->env(), v8::Object::New(isolate_), {0, 0},`
`36`		`- node::InternalCallbackScope::kNoFlags);`
	`33`	`+ node::CallbackScope microtasks_scope(isolate_, v8::Object::New(isolate_),`
	`34`	`+ {0, 0});`
`37`	`35`	`}`
`38`	`36`	`}`
`39`	`37`