Revert 283572 "Changes to RenderFrameProxy:"

trunk/src/content/renderer/child_frame_compositing_helper.cc

 // 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.
 
 #include "content/renderer/child_frame_compositing_helper.h"
 
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/layers/solid_color_layer.h"
@@ skipping 22 matching lines @@
 namespace content {
 
 ChildFrameCompositingHelper::SwapBuffersInfo::SwapBuffersInfo()
     : route_id(0),
       output_surface_id(0),
       host_id(0),
       software_frame_id(0),
       shared_memory(NULL) {}
 
 ChildFrameCompositingHelper*
-ChildFrameCompositingHelper::CreateForBrowserPlugin(
+ChildFrameCompositingHelper::CreateCompositingHelperForBrowserPlugin(
     const base::WeakPtr<BrowserPlugin>& browser_plugin) {
   return new ChildFrameCompositingHelper(
       browser_plugin, NULL, NULL, browser_plugin->render_view_routing_id());
 }
 
 ChildFrameCompositingHelper*
-ChildFrameCompositingHelper::CreateForRenderFrameProxy(
-    RenderFrameProxy* render_frame_proxy) {
-  return new ChildFrameCompositingHelper(base::WeakPtr<BrowserPlugin>(),
-                                         render_frame_proxy->web_frame(),
-                                         render_frame_proxy,
-                                         render_frame_proxy->routing_id());
+ChildFrameCompositingHelper::CreateCompositingHelperForRenderFrame(
+    blink::WebFrame* frame,
+    RenderFrameProxy* render_frame_proxy,
+    int host_routing_id) {
+  return new ChildFrameCompositingHelper(
+      base::WeakPtr<BrowserPlugin>(), frame, render_frame_proxy,
+      host_routing_id);
 }
 
 ChildFrameCompositingHelper::ChildFrameCompositingHelper(
     const base::WeakPtr<BrowserPlugin>& browser_plugin,
     blink::WebFrame* frame,
     RenderFrameProxy* render_frame_proxy,
     int host_routing_id)
     : host_routing_id_(host_routing_id),
       last_route_id_(0),
       last_output_surface_id_(0),
@@ skipping 492 matching lines @@
                                       dest_size.height());
   }
   if (GetBrowserPluginManager()) {
     GetBrowserPluginManager()->Send(
         new BrowserPluginHostMsg_CopyFromCompositingSurfaceAck(
             host_routing_id_, GetInstanceID(), request_id, resized_bitmap));
   }
 }
 
 }  // namespace content