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

Fix release render view with wrong ID

Browse source
This commit is contained in:
Cheng Zhao 2015-06-23 16:43:55 +08:00
parent 015ef3e014
commit 1f97cee7c9
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_web_contents.cc
View file

@ -249,9 +249,7 @@ void WebContents::ExitFullscreenModeForTab(content::WebContents* source) {
} }
void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) { void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
Emit("render-view-deleted", Emit("render-view-deleted", render_view_host->GetProcess()->GetID());
render_view_host->GetProcess()->GetID(),
render_view_host->GetRoutingID());
} }
void WebContents::RenderProcessGone(base::TerminationStatus status) { void WebContents::RenderProcessGone(base::TerminationStatus status) {

4
atom/browser/api/lib/web-contents.coffee
View file

@ -32,8 +32,8 @@ wrapWebContents = (webContents) ->
# Tell the rpc server that a render view has been deleted and we need to # Tell the rpc server that a render view has been deleted and we need to
# release all objects owned by it. # release all objects owned by it.
webContents.on 'render-view-deleted', (event, processId, routingId) -> webContents.on 'render-view-deleted', (event, processId) ->
process.emit 'ATOM_BROWSER_RELEASE_RENDER_VIEW', "#{processId}-#{routingId}" process.emit 'ATOM_BROWSER_RELEASE_RENDER_VIEW', processId
# Dispatch IPC messages to the ipc module. # Dispatch IPC messages to the ipc module.
webContents.on 'ipc-message', (event, packed) -> webContents.on 'ipc-message', (event, packed) ->