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

Unified Diff: content/browser/frame_host/render_frame_host_manager.h

Issue 345823002: Move ownership of ChildFrameCompositingHelper from frame to proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/browser/frame_host/render_frame_host_manager.h
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h
index 102d3b76e66dc2b396bd4a9865170dac8e0675f3..35abab1668d34ac2be11023d1f37d7b9747aca41 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -154,6 +154,8 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
// there is no current one.
RenderWidgetHostView* GetRenderWidgetHostView() const;
+ RenderFrameProxyHost* GetProxyToParent();
+
// Returns the pending RenderFrameHost, or NULL if there is no pending one.
RenderFrameHostImpl* pending_frame_host() const {
return pending_render_frame_host_.get();
@@ -476,13 +478,6 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
NotificationRegistrar registrar_;
- // When |render_frame_host_| is in a different process from its parent in
- // the frame tree, this class connects its associated RenderWidgetHostView
- // to the proxy RenderFrameHost for the parent's renderer process. NULL
- // when |render_frame_host_| is the frame tree root or is in the same
- // process as its parent.
- CrossProcessFrameConnector* cross_process_frame_connector_;
-
base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);

Powered by Google App Engine
This is Rietveld 408576698