ELECTRON-455: fix memory leak on closing pop ups (#359)

This commit is contained in:
Vishwas Shashidhar 2018-05-09 12:34:04 +05:30 committed by GitHub
parent 1739a25f22
commit 1e924274b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -395,21 +395,6 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
browserWin.winName = frameName; browserWin.winName = frameName;
browserWin.setAlwaysOnTop(alwaysOnTop); browserWin.setAlwaysOnTop(alwaysOnTop);
let handleChildWindowClosed = () => {
removeWindowKey(newWinKey);
browserWin.removeListener('move', throttledBoundsChange);
browserWin.removeListener('resize', throttledBoundsChange);
};
browserWin.once('closed', () => {
handleChildWindowClosed();
});
browserWin.on('close', () => {
browserWin.webContents.removeListener('new-window', handleNewWindow);
browserWin.webContents.removeListener('crashed', handleChildWindowCrashEvent);
});
let handleChildWindowCrashEvent = (e) => { let handleChildWindowCrashEvent = (e) => {
const options = { const options = {
type: 'error', type: 'error',
@ -450,6 +435,21 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
browserWin.on('move', throttledBoundsChange); browserWin.on('move', throttledBoundsChange);
browserWin.on('resize', throttledBoundsChange); browserWin.on('resize', throttledBoundsChange);
let handleChildWindowClosed = () => {
removeWindowKey(newWinKey);
browserWin.removeListener('move', throttledBoundsChange);
browserWin.removeListener('resize', throttledBoundsChange);
};
browserWin.on('close', () => {
browserWin.webContents.removeListener('new-window', handleNewWindow);
browserWin.webContents.removeListener('crashed', handleChildWindowCrashEvent);
});
browserWin.once('closed', () => {
handleChildWindowClosed();
});
handlePermissionRequests(browserWin.webContents); handlePermissionRequests(browserWin.webContents);
} }
}); });