fix: call UnregisterIsolate consistently (electron#28486)

indutny · web-flow · commit fe0da255b6de · 2021-04-06T16:10:34.000-07:00
diff --git a/shell/app/node_main.cc b/shell/app/node_main.cc
@@ -279,10 +279,6 @@ int NodeMain(int argc, char* argv[]) {
     node::Stop(env);
     node::FreeEnvironment(env);
     node::FreeIsolateData(isolate_data);
-
-    gin_env.platform()->DrainTasks(isolate);
-    gin_env.platform()->CancelPendingDelayedTasks(isolate);
-    gin_env.platform()->UnregisterIsolate(isolate);
   }
 
   // According to "src/gin/shell/gin_main.cc":
diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc
@@ -160,13 +160,19 @@ JavascriptEnvironment::JavascriptEnvironment(uv_loop_t* event_loop)
 }
 
 JavascriptEnvironment::~JavascriptEnvironment() {
+  DCHECK_NE(platform_, nullptr);
+  platform_->DrainTasks(isolate_);
+
   {
     v8::Locker locker(isolate_);
     v8::HandleScope scope(isolate_);
     context_.Get(isolate_)->Exit();
   }
   isolate_->Exit();
   g_isolate = nullptr;
+
+  platform_->CancelPendingDelayedTasks(isolate_);
+  platform_->UnregisterIsolate(isolate_);
 }
 
 class EnabledStateObserverImpl final

Original file line number	Diff line number	Diff line change
`@@ -160,13 +160,19 @@ JavascriptEnvironment::JavascriptEnvironment(uv_loop_t* event_loop)`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`JavascriptEnvironment::~JavascriptEnvironment() {`
	`163`	`+ DCHECK_NE(platform_, nullptr);`
	`164`	`+ platform_->DrainTasks(isolate_);`
	`165`	`+`
`163`	`166`	`{`
`164`	`167`	`v8::Locker locker(isolate_);`
`165`	`168`	`v8::HandleScope scope(isolate_);`
`166`	`169`	`context_.Get(isolate_)->Exit();`
`167`	`170`	`}`
`168`	`171`	`isolate_->Exit();`
`169`	`172`	`g_isolate = nullptr;`
	`173`	`+`
	`174`	`+ platform_->CancelPendingDelayedTasks(isolate_);`
	`175`	`+ platform_->UnregisterIsolate(isolate_);`
`170`	`176`	`}`
`171`	`177`
`172`	`178`	`class EnabledStateObserverImpl final`