Revert 283572 "Changes to RenderFrameProxy:"

trunk/src/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 38 matching lines @@
 namespace content {
 
 class BrowserPlugin;
 class BrowserPluginManager;
 class RenderFrameProxy;
 
 class CONTENT_EXPORT ChildFrameCompositingHelper
     : public base::RefCounted<ChildFrameCompositingHelper>,
       public cc::DelegatedFrameResourceCollectionClient {
  public:
-  static ChildFrameCompositingHelper* CreateForBrowserPlugin(
+  static ChildFrameCompositingHelper* CreateCompositingHelperForBrowserPlugin(
       const base::WeakPtr<BrowserPlugin>& browser_plugin);
-  static ChildFrameCompositingHelper* CreateForRenderFrameProxy(
-      RenderFrameProxy* render_frame_proxy);
+  static ChildFrameCompositingHelper* CreateCompositingHelperForRenderFrame(
+      blink::WebFrame* 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,
                         int gpu_route_id,
@@ skipping 92 matching lines @@
   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_