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

Unified Diff: content/renderer/render_frame_impl.h

Issue 1409693009: Fix leaking of RenderFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing just the pending RF leak. Created 5 years, 2 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.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index e5146f415d8201e860b63d368a8b865fbc381c49..2599a5574e56dde1427571fd203afb4fbfdb4e1e 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -167,6 +167,9 @@ class CONTENT_EXPORT RenderFrameImpl
CompositorDependencies* compositor_deps,
const FrameMsg_NewFrame_WidgetParams& params);
+ // Detaches a RenderFrame identified by |routing_id|.
+ static void DetachFrame(int routing_id);
+
// Returns the RenderFrameImpl for the given routing ID.
static RenderFrameImpl* FromRoutingID(int routing_id);
@@ -883,6 +886,10 @@ class CONTENT_EXPORT RenderFrameImpl
// ServiceProvider.
mojo::ServiceProviderPtr ConnectToApplication(const GURL& url);
+ void set_is_browser_initiated_detach() {
+ is_browser_initiated_detach_ = true;
+ }
+
// Stores the WebLocalFrame we are associated with. This is null from the
// constructor until SetWebFrame is called, and it is null after
// frameDetached is called until destruction (which is asynchronous in the
@@ -898,6 +905,11 @@ class CONTENT_EXPORT RenderFrameImpl
// or it is a main frame.
bool is_local_root_;
+ // When a frame is detached in response to a messge from the browser process,
+ // this RenderFrame should not be sending notifications back to it. This
+ // boolean is used to indicate this case.
+ bool is_browser_initiated_detach_;
Charlie Reis 2015/10/30 20:15:44 nit: in_browser_initiated_detach_, perhaps? Altho
nasko 2015/11/02 22:48:52 It is meant to indicate that it is a browser initi
+
base::WeakPtr<RenderViewImpl> render_view_;
int routing_id_;
bool is_swapped_out_;

Powered by Google App Engine
This is Rietveld 408576698