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

fix: crash calling BrowserWindow.removeBrowserView() with destroyed webContents (#38842)

Browse source 
fix: crash calling removeBrowserView() with destroyed webContents

https://github.com/electron/electron/issues/37642
This commit is contained in:
Shelley Vohr 2023-06-21 21:20:54 +02:00 committed by GitHub
parent ce6fe040fe
commit a00a25376d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/api/electron_api_browser_view.cc
View file

@ -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) {

3
shell/browser/api/electron_api_browser_view.h
View file

@ -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);

14
spec/api-browser-view-spec.ts
View file

@ -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()', () => {