content/browser/renderer_host/render_view_host_impl.cc - Issue 1453803002: Separate RenderViewHost from RenderWidgetHost, part 10: shutdown.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 1453803002: Separate RenderViewHost from RenderWidgetHost, part 10: shutdown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: all in destroy, plus mac Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/browser/renderer_host/render_widget_host_impl.h » ('j') | content/browser/renderer_host/render_widget_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_view_host_impl.cc

diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc

index 29e5e68ee0dfa15bfb5617239941f12eb815a91e..5a8d4881a7353c2bfcac0ba27e5514d717700347 100644

--- a/content/browser/renderer_host/render_view_host_impl.cc

+++ b/content/browser/renderer_host/render_view_host_impl.cc

@@ -965,7 +965,7 @@ void RenderViewHostImpl::RenderWidgetDidInit() {

PostRenderViewReady();

}

-void RenderViewHostImpl::Shutdown() {

+void RenderViewHostImpl::ShutdownAndDestroy() {

// We can't release the SessionStorageNamespace until our peer

// in the renderer has wound down.

if (GetProcess()->HasConnection()) {

@@ -975,7 +975,8 @@ void RenderViewHostImpl::Shutdown() {

GetRoutingID());

}

- RenderWidgetHostImpl::Shutdown();

+ GetWidget()->ShutdownAndDestroyWidget(false);

+ delete this;

}

void RenderViewHostImpl::RenderWidgetWillBeHidden() {