github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: cleanup how WebContents is destroyed (#27920)

Browse Source
This commit is contained in:
Cheng Zhao
2021-03-07 21:14:12 +09:00
committed by GitHub
parent b3a0743121
commit f4e1a343b9
12 changed files with 131 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/browser/api/electron_api_base_window.cc
View File

@@ -114,8 +114,7 @@ BaseWindow::BaseWindow(gin_helper::Arguments* args,
}
BaseWindow::~BaseWindow() {
if (!window_->IsClosed())
window_->CloseImmediately();
CloseImmediately();
// Destroy the native window in next tick because the native code might be
// iterating all windows.
@@ -318,6 +317,11 @@ void BaseWindow::SetContentView(gin::Handle<View> view) {
window_->SetContentView(view->view());
}
void BaseWindow::CloseImmediately() {
if (!window_->IsClosed())
window_->CloseImmediately();
}
void BaseWindow::Close() {
window_->Close();
}