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

Always register closed listeners

Browse source
This commit is contained in:
Kevin Sawicki 2017-07-10 17:50:54 -07:00
parent 208be2a542
commit fc53ac3d38
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/browser/guest-window-manager.js
View file

@ -80,19 +80,8 @@ const setupGuest = function (embedder, frameName, guest, options) {
embedder.send('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_' + guestId) embedder.send('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_' + guestId)
embedder.removeListener('render-view-deleted', closedByEmbedder) embedder.removeListener('render-view-deleted', closedByEmbedder)
} }
if (!options.webPreferences.sandbox) {
// These events should only be handled when the guest window is opened by a
// non-sandboxed renderer for two reasons:
//
// - `render-view-deleted` is emitted when the popup is closed by the user,
// and that will eventually result in NativeWindow::NotifyWindowClosed
// using a dangling pointer since `destroy()` would have been called by
// `closeByEmbedded`
// - No need to emit `ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_` since
// there's no renderer code listening to it.,
embedder.once('render-view-deleted', closedByEmbedder) embedder.once('render-view-deleted', closedByEmbedder)
guest.once('closed', closedByUser) guest.once('closed', closedByUser)
}
if (frameName) { if (frameName) {
frameToGuest.set(frameName, guest) frameToGuest.set(frameName, guest)
guest.frameName = frameName guest.frameName = frameName