Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(810)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1052223008: Shutdown RenderWidgetHost owned by RenderFrameHost when destroying the RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 3cf9e9b856fb9c83a4485e4129e9acf60d8d37c9..900574c7e80a174ea90ff6b06a875ae642d6d050 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2233,8 +2233,13 @@ void RenderFrameImpl::frameDetached(blink::WebFrame* frame) {
CHECK_EQ(it->second, this);
g_frame_map.Get().erase(it);
- if (is_subframe)
+ if (is_subframe) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSitePerProcess) && render_widget_) {
+ render_widget_->UnregisterRenderFrame(this);
+ }
frame->parent()->removeChild(frame);
+ }
// |frame| is invalid after here. Be sure to clear frame_ as well, since this
// object may not be deleted immediately and other methods may try to access

Powered by Google App Engine
This is Rietveld 408576698