Move ownership of ChildFrameCompositingHelper from frame to proxy.

content/renderer/child_frame_compositing_helper.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
 #define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 32 matching lines @@
 }
 
 struct FrameHostMsg_CompositorFrameSwappedACK_Params;
 struct FrameHostMsg_BuffersSwappedACK_Params;
 struct FrameHostMsg_ReclaimCompositorResources_Params;
 
 namespace content {
 
 class BrowserPlugin;
 class BrowserPluginManager;
-class RenderFrameImpl;
+class RenderFrameProxy;
 
 class CONTENT_EXPORT ChildFrameCompositingHelper
     : public base::RefCounted<ChildFrameCompositingHelper>,
       public cc::DelegatedFrameResourceCollectionClient {
  public:
   static ChildFrameCompositingHelper* CreateCompositingHelperForBrowserPlugin(
       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,
                                   gfx::Rect source_rect,
                                   gfx::Size dest_size);
   void DidCommitCompositorFrame();
   void EnableCompositing(bool);
   void OnContainerDestroy();
   void OnBuffersSwapped(const gfx::Size& size,
                         const gpu::Mailbox& mailbox,
@@ skipping 13 matching lines @@
   void SetContentsOpaque(bool);
 
  protected:
   // Friend RefCounted so that the dtor can be non-public.
   friend class base::RefCounted<ChildFrameCompositingHelper>;
 
  private:
   ChildFrameCompositingHelper(
       const base::WeakPtr<BrowserPlugin>& browser_plugin,
       blink::WebFrame* frame,
-      RenderFrameImpl* render_frame,
+      RenderFrameProxy* render_frame_proxy,
       int host_routing_id);
 
   enum SwapBuffersType {
     TEXTURE_IMAGE_TRANSPORT,
     GL_COMPOSITOR_FRAME,
     SOFTWARE_COMPOSITOR_FRAME,
   };
   struct SwapBuffersInfo {
     SwapBuffersInfo();
 
@@ skipping 42 matching lines @@
   bool software_ack_pending_;
   bool opaque_;
   std::vector<unsigned> unacked_software_frames_;
 
   gfx::Size buffer_size_;
 
   // The lifetime of this weak pointer should be greater than the lifetime of
   // 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_;
 
   scoped_refptr<cc::SolidColorLayer> background_layer_;
   scoped_refptr<cc::TextureLayer> texture_layer_;
   scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_;
   scoped_ptr<blink::WebLayer> web_layer_;
   blink::WebFrame* frame_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_