mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
fix: crash calling BrowserWindow.removeBrowserView() with destroyed webContents (#38842)
fix: crash calling removeBrowserView() with destroyed webContents https://github.com/electron/electron/issues/37642
This commit is contained in:
@@ -131,6 +131,10 @@ void BrowserView::WebContentsDestroyed() {
|
||||
Unpin();
|
||||
}
|
||||
|
||||
void BrowserView::OnCloseContents() {
|
||||
api_web_contents_ = nullptr;
|
||||
}
|
||||
|
||||
// static
|
||||
gin::Handle<BrowserView> BrowserView::New(gin_helper::ErrorThrower thrower,
|
||||
gin::Arguments* args) {
|
||||
|
||||
@@ -71,6 +71,9 @@ class BrowserView : public gin::Wrappable<BrowserView>,
|
||||
// content::WebContentsObserver:
|
||||
void WebContentsDestroyed() override;
|
||||
|
||||
// ExtendedWebContentsObserver:
|
||||
void OnCloseContents() override;
|
||||
|
||||
private:
|
||||
void SetAutoResize(AutoResizeFlags flags);
|
||||
void SetBounds(const gfx::Rect& bounds);
|
||||
|
||||
@@ -257,6 +257,20 @@ describe('BrowserView module', () => {
|
||||
w.removeBrowserView(view);
|
||||
}).to.not.throw();
|
||||
});
|
||||
|
||||
it('can be called on a BrowserView with a destroyed webContents', (done) => {
|
||||
view = new BrowserView();
|
||||
w.addBrowserView(view);
|
||||
|
||||
view.webContents.on('destroyed', () => {
|
||||
w.removeBrowserView(view);
|
||||
done();
|
||||
});
|
||||
|
||||
view.webContents.loadURL('data:text/html,hello there').then(() => {
|
||||
view.webContents.close();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('BrowserWindow.getBrowserViews()', () => {
|
||||
|
||||
Reference in New Issue
Block a user