From 1d4dd84487253569cd14a98b25117aae6d099999 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Sun, 13 Dec 2020 20:25:15 -0800 Subject: [PATCH] fix: handle BrowserView reparenting --- shell/browser/api/electron_api_base_window.cc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/shell/browser/api/electron_api_base_window.cc b/shell/browser/api/electron_api_base_window.cc index 1314fd2bf1d49..54b532798b283 100644 --- a/shell/browser/api/electron_api_base_window.cc +++ b/shell/browser/api/electron_api_base_window.cc @@ -759,6 +759,14 @@ void BaseWindow::AddBrowserView(v8::Local value) { auto get_that_view = browser_views_.find(browser_view->ID()); if (get_that_view == browser_views_.end()) { if (browser_view->web_contents()) { + // If we're reparenting a BrowserView, ensure that it's detached from + // its previous owner window. + auto* owner_window = browser_view->web_contents()->owner_window(); + if (owner_window && owner_window != window_.get()) { + owner_window->RemoveBrowserView(browser_view->view()); + browser_view->web_contents()->SetOwnerWindow(nullptr); + } + window_->AddBrowserView(browser_view->view()); browser_view->web_contents()->SetOwnerWindow(window_.get()); } @@ -1071,9 +1079,12 @@ void BaseWindow::ResetBrowserViews() { v8::Local::New(isolate(), item.second), &browser_view) && !browser_view.IsEmpty()) { - if (browser_view->web_contents()) { - window_->RemoveBrowserView(browser_view->view()); + // There's a chance that the BrowserView may have been reparented - only + // reset if the owner window is *this* window. + auto* owner_window = browser_view->web_contents()->owner_window(); + if (browser_view->web_contents() && owner_window == window_.get()) { browser_view->web_contents()->SetOwnerWindow(nullptr); + owner_window->RemoveBrowserView(browser_view->view()); } }