|
@@ -575,8 +575,13 @@ void NodeBindings::UvRunOnce() {
|
|
|
// Enter node context while dealing with uv events.
|
|
|
v8::Context::Scope context_scope(env->context());
|
|
|
|
|
|
- // Perform microtask checkpoint after running JavaScript.
|
|
|
- gin_helper::MicrotasksScope microtasks_scope(env->isolate());
|
|
|
+ // 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.
|
|
|
+ auto old_policy = env->isolate()->GetMicrotasksPolicy();
|
|
|
+ DCHECK_EQ(v8::MicrotasksScope::GetCurrentDepth(env->isolate()), 0);
|
|
|
+ env->isolate()->SetMicrotasksPolicy(v8::MicrotasksPolicy::kExplicit);
|
|
|
|
|
|
if (browser_env_ != BrowserEnvironment::kBrowser)
|
|
|
TRACE_EVENT_BEGIN0("devtools.timeline", "FunctionCall");
|
|
@@ -587,6 +592,8 @@ void NodeBindings::UvRunOnce() {
|
|
|
if (browser_env_ != BrowserEnvironment::kBrowser)
|
|
|
TRACE_EVENT_END0("devtools.timeline", "FunctionCall");
|
|
|
|
|
|
+ env->isolate()->SetMicrotasksPolicy(old_policy);
|
|
|
+
|
|
|
if (r == 0)
|
|
|
base::RunLoop().QuitWhenIdle(); // Quit from uv.
|
|
|
|