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

trigger beforeunload; fix crash when getting webContents after destroy

Browse Source
This commit is contained in:
Jeremy Rose
2022-10-05 17:05:29 -07:00
parent 389fefac8a
commit 997d46f090
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/browser/api/browser-window.ts
View File

@@ -47,6 +47,10 @@ BrowserWindow.prototype._init = function (this: BWT) {
this._browserViews = [];
this.on('close', () => {
this._browserViews.forEach(b => b.webContents.close({ waitForBeforeUnload: true }));
});
const warn = deprecate.warnOnceMessage('\'scroll-touch-{begin,end,edge}\' are deprecated and will be removed. Please use the WebContents \'input-event\' event instead.');
this.webContents.on('input-event', (_, e) => {
if (e.type === 'gestureScrollBegin') {

5
shell/browser/api/electron_api_web_contents_view.cc
View File

@@ -54,7 +54,10 @@ WebContentsView::~WebContentsView() {
}
gin::Handle<WebContents> WebContentsView::GetWebContents(v8::Isolate* isolate) {
return gin::CreateHandle(isolate, api_web_contents_);
if (api_web_contents_)
return gin::CreateHandle(isolate, api_web_contents_);
else
return gin::Handle<WebContents>();
}
void WebContentsView::SetBackgroundColor(absl::optional<WrappedSkColor> color) {