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

Unified Diff: content/renderer/child_frame_compositing_helper.h

Issue 345823002: Move ownership of ChildFrameCompositingHelper from frame to proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes based on Ken's review and fix for Android. 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/renderer/child_frame_compositing_helper.h
diff --git a/content/renderer/child_frame_compositing_helper.h b/content/renderer/child_frame_compositing_helper.h
index c33083e3036abfaa3c43d47d9dab781e8e98d381..d66ae3f7cd821486d83d80864a359a24413a1700 100644
--- a/content/renderer/child_frame_compositing_helper.h
+++ b/content/renderer/child_frame_compositing_helper.h
@@ -50,7 +50,7 @@ namespace content {
class BrowserPlugin;
class BrowserPluginManager;
-class RenderFrameImpl;
+class RenderFrameProxy;
class CONTENT_EXPORT ChildFrameCompositingHelper
: public base::RefCounted<ChildFrameCompositingHelper>,
@@ -60,7 +60,7 @@ class CONTENT_EXPORT ChildFrameCompositingHelper
const base::WeakPtr<BrowserPlugin>& browser_plugin);
static ChildFrameCompositingHelper* CreateCompositingHelperForRenderFrame(
blink::WebFrame* frame,
- RenderFrameImpl* render_frame,
+ RenderFrameProxy* render_frame_proxy,
int host_routing_id);
void CopyFromCompositingSurface(int request_id,
@@ -94,7 +94,7 @@ class CONTENT_EXPORT ChildFrameCompositingHelper
ChildFrameCompositingHelper(
const base::WeakPtr<BrowserPlugin>& browser_plugin,
blink::WebFrame* frame,
- RenderFrameImpl* render_frame,
+ RenderFrameProxy* render_frame_proxy,
int host_routing_id);
enum SwapBuffersType {
@@ -157,7 +157,7 @@ class CONTENT_EXPORT ChildFrameCompositingHelper
// other member objects, as they may access this pointer during their
// destruction.
base::WeakPtr<BrowserPlugin> browser_plugin_;
- RenderFrameImpl* render_frame_;
+ RenderFrameProxy* render_frame_proxy_;
scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_;
scoped_refptr<cc::DelegatedFrameProvider> frame_provider_;
« no previous file with comments | « no previous file | content/renderer/child_frame_compositing_helper.cc » ('j') | content/renderer/render_widget.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698