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

Don't clear until render view is deleted for process id

Browse source
This commit is contained in:
Kevin Sawicki 2016-11-30 16:07:02 -08:00
parent 851f490168
commit f3d391e3f2
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/browser/objects-registry.js
View file

@ -19,17 +19,14 @@ class ObjectsRegistry {
// registered then the already assigned ID would be returned. // registered then the already assigned ID would be returned.
add (webContents, obj) { add (webContents, obj) {
// Get or assign an ID to the object. // Get or assign an ID to the object.
let id = this.saveToStorage(obj) const id = this.saveToStorage(obj)
// Add object to the set of referenced objects. // Add object to the set of referenced objects.
let webContentsId = webContents.getId() const webContentsId = webContents.getId()
let owner = this.owners[webContentsId] let owner = this.owners[webContentsId]
if (!owner) { if (!owner) {
owner = this.owners[webContentsId] = new Set() owner = this.owners[webContentsId] = new Set()
// Clear the storage when webContents is reloaded/navigated. this.registerDeleteListener(webContents, webContentsId)
webContents.once('render-view-deleted', () => {
this.clear(webContentsId)
})
} }
if (!owner.has(id)) { if (!owner.has(id)) {
owner.add(id) owner.add(id)
@ -39,6 +36,18 @@ class ObjectsRegistry {
return id return id
} }
// Clear the storage when webContents is reloaded/navigated.
registerDeleteListener (webContents, webContentsId) {
const processId = webContents.getProcessId()
const listener = (event, deletedProcessId) => {
if (deletedProcessId === processId) {
webContents.removeListener('render-view-deleted', listener)
this.clear(webContentsId)
}
}
webContents.on('render-view-deleted', listener)
}
// Get an object according to its ID. // Get an object according to its ID.
get (id) { get (id) {
const pointer = this.storage[id] const pointer = this.storage[id]
@ -90,7 +99,7 @@ class ObjectsRegistry {
pointer.count -= 1 pointer.count -= 1
if (pointer.count === 0) { if (pointer.count === 0) {
v8Util.deleteHiddenValue(pointer.object, 'atomId') v8Util.deleteHiddenValue(pointer.object, 'atomId')
return delete this.storage[id] delete this.storage[id]
} }
} }
} }