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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 return render_frame_host_.get(); 147 return render_frame_host_.get();
148 } 148 }
149 149
150 // TODO(creis): Remove this when we no longer use RVH for navigation. 150 // TODO(creis): Remove this when we no longer use RVH for navigation.
151 RenderViewHostImpl* current_host() const; 151 RenderViewHostImpl* current_host() const;
152 152
153 // Returns the view associated with the current RenderViewHost, or NULL if 153 // Returns the view associated with the current RenderViewHost, or NULL if
154 // there is no current one. 154 // there is no current one.
155 RenderWidgetHostView* GetRenderWidgetHostView() const; 155 RenderWidgetHostView* GetRenderWidgetHostView() const;
156 156
157 RenderFrameProxyHost* GetProxyToParent();
158
157 // Returns the pending RenderFrameHost, or NULL if there is no pending one. 159 // Returns the pending RenderFrameHost, or NULL if there is no pending one.
158 RenderFrameHostImpl* pending_frame_host() const { 160 RenderFrameHostImpl* pending_frame_host() const {
159 return pending_render_frame_host_.get(); 161 return pending_render_frame_host_.get();
160 } 162 }
161 163
162 // TODO(creis): Remove this when we no longer use RVH for navigation. 164 // TODO(creis): Remove this when we no longer use RVH for navigation.
163 RenderViewHostImpl* pending_render_view_host() const; 165 RenderViewHostImpl* pending_render_view_host() const;
164 166
165 // Returns the current committed Web UI or NULL if none applies. 167 // Returns the current committed Web UI or NULL if none applies.
166 WebUIImpl* web_ui() const { return web_ui_.get(); } 168 WebUIImpl* web_ui() const { return web_ui_.get(); }
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 typedef base::hash_map<int32, linked_ptr<RenderFrameHostImpl> > 471 typedef base::hash_map<int32, linked_ptr<RenderFrameHostImpl> >
470 RFHPendingDeleteMap; 472 RFHPendingDeleteMap;
471 RFHPendingDeleteMap pending_delete_hosts_; 473 RFHPendingDeleteMap pending_delete_hosts_;
472 474
473 // The intersitial page currently shown if any, not own by this class 475 // The intersitial page currently shown if any, not own by this class
474 // (the InterstitialPage is self-owned, it deletes itself when hidden). 476 // (the InterstitialPage is self-owned, it deletes itself when hidden).
475 InterstitialPageImpl* interstitial_page_; 477 InterstitialPageImpl* interstitial_page_;
476 478
477 NotificationRegistrar registrar_; 479 NotificationRegistrar registrar_;
478 480
479 // When |render_frame_host_| is in a different process from its parent in
480 // the frame tree, this class connects its associated RenderWidgetHostView
481 // to the proxy RenderFrameHost for the parent's renderer process. NULL
482 // when |render_frame_host_| is the frame tree root or is in the same
483 // process as its parent.
484 CrossProcessFrameConnector* cross_process_frame_connector_;
485
486 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 481 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
487 482
488 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 483 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
489 }; 484 };
490 485
491 } // namespace content 486 } // namespace content
492 487
493 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 488 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698