github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-28 16:58:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: detach webview instead of destroying it

Browse Source 
Chromium no longer cleans up everything when a guest webcontents is
destroyed, we have to force detaching it and let Chromium destroy everything.
This commit is contained in:
Cheng Zhao
2019-01-12 15:50:33 +09:00
committed by Jeremy Apthorp
parent 5e043812ef
commit 03d499bf34
7 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/browser/guest-view-manager.js
View File

@@ -181,7 +181,7 @@ const attachGuest = function (event, embedderFrameId, elementInstanceId, guestIn
const oldGuestInstance = guestInstances[oldGuestInstanceId]
if (oldGuestInstance) {
oldGuestInstance.guest.destroy()
oldGuestInstance.guest.detachFromOuterFrame()
}
}
@@ -360,7 +360,7 @@ handleMessage('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST_SYNC', function (event,
handleMessage('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', function (event, guestInstanceId) {
try {
const guest = getGuestForWebContents(guestInstanceId, event.sender)
guest.destroy()
guest.detachFromOuterFrame()
} catch (error) {
console.error(`Guest destroy failed: ${error}`)
}