mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: call UnregisterIsolate consistently (#28486)

Browse source
This commit is contained in:
Fedor Indutny 2021-04-06 16:10:34 -07:00 • committed by GitHub
parent 63317627b5
commit fe0da255b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/app/node_main.cc
View file

@ -279,10 +279,6 @@ int NodeMain(int argc, char* argv[]) {
node::Stop(env); node::Stop(env);
node::FreeEnvironment(env); node::FreeEnvironment(env);
node::FreeIsolateData(isolate_data); 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": // According to "src/gin/shell/gin_main.cc":

6
shell/browser/javascript_environment.cc
View file

@ -160,6 +160,9 @@ JavascriptEnvironment::JavascriptEnvironment(uv_loop_t* event_loop)
} }
JavascriptEnvironment::~JavascriptEnvironment() { JavascriptEnvironment::~JavascriptEnvironment() {
DCHECK_NE(platform_, nullptr);
platform_->DrainTasks(isolate_);
{ {
v8::Locker locker(isolate_); v8::Locker locker(isolate_);
v8::HandleScope scope(isolate_); v8::HandleScope scope(isolate_);
@ -167,6 +170,9 @@ JavascriptEnvironment::~JavascriptEnvironment() {
} }
isolate_->Exit(); isolate_->Exit();
g_isolate = nullptr; g_isolate = nullptr;
platform_->CancelPendingDelayedTasks(isolate_);
platform_->UnregisterIsolate(isolate_);
} }
class EnabledStateObserverImpl final class EnabledStateObserverImpl final