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

Use 1.3 getId implementation to track render view deletesp

Browse Source
This commit is contained in:
Kevin Sawicki
2016-12-06 12:56:14 -08:00
parent c300104cbd
commit ac54984763
3 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
atom/browser/api/atom_api_web_contents.cc
View File

@@ -807,10 +807,6 @@ int WebContents::GetID() const {
return web_contents()->GetRenderProcessHost()->GetID();
}
int WebContents::GetProcessID() const {
return web_contents()->GetRenderProcessHost()->GetID();
}
WebContents::Type WebContents::GetType() const {
return type_;
}
@@ -1473,7 +1469,6 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
.MakeDestroyable()
.SetMethod("getId", &WebContents::GetID)
.SetMethod("getProcessId", &WebContents::GetProcessID)
.SetMethod("equal", &WebContents::Equal)
.SetMethod("_loadURL", &WebContents::LoadURL)
.SetMethod("downloadURL", &WebContents::DownloadURL)

1
atom/browser/api/atom_api_web_contents.h
View File

@@ -67,7 +67,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
v8::Local<v8::FunctionTemplate> prototype);
int GetID() const;
int GetProcessID() const;
Type GetType() const;
bool Equal(const WebContents* web_contents) const;
void LoadURL(const GURL& url, const mate::Dictionary& options);

3
lib/browser/objects-registry.js
View File

@@ -92,9 +92,8 @@ class ObjectsRegistry {
// Private: Clear the storage when webContents is reloaded/navigated.
registerDeleteListener (webContents, webContentsId) {
const processId = webContents.getProcessId()
const listener = (event, deletedProcessId) => {
if (deletedProcessId === processId) {
if (deletedProcessId === webContentsId) {
webContents.removeListener('render-view-deleted', listener)
this.clear(webContentsId)
}