Move ownership of ChildFrameCompositingHelper from frame to proxy.

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"
 #include "cc/layers/texture_layer.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/resources/single_release_callback.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/frame_messages.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "content/renderer/compositor_bindings/web_layer_impl.h"
 #include "content/renderer/render_frame_impl.h"
+#include "content/renderer/render_frame_proxy.h"
 #include "content/renderer/render_thread_impl.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/skia_util.h"
 
 namespace content {
 
 ChildFrameCompositingHelper::SwapBuffersInfo::SwapBuffersInfo()
     : route_id(0),
       output_surface_id(0),
       host_id(0),
       software_frame_id(0),
       shared_memory(NULL) {}
 
 ChildFrameCompositingHelper*
 ChildFrameCompositingHelper::CreateCompositingHelperForBrowserPlugin(
     const base::WeakPtr<BrowserPlugin>& browser_plugin) {
   return new ChildFrameCompositingHelper(
       browser_plugin, NULL, NULL, browser_plugin->render_view_routing_id());
 }
 
 ChildFrameCompositingHelper*
 ChildFrameCompositingHelper::CreateCompositingHelperForRenderFrame(
     blink::WebFrame* frame,
-    RenderFrameImpl* render_frame,
+    RenderFrameProxy* render_frame_proxy,
     int host_routing_id) {
   return new ChildFrameCompositingHelper(
-      base::WeakPtr<BrowserPlugin>(), frame, render_frame, host_routing_id);
+      base::WeakPtr<BrowserPlugin>(), frame, render_frame_proxy,
+      host_routing_id);
 }
 
 ChildFrameCompositingHelper::ChildFrameCompositingHelper(
     const base::WeakPtr<BrowserPlugin>& browser_plugin,
     blink::WebFrame* frame,
-    RenderFrameImpl* render_frame,
+    RenderFrameProxy* render_frame_proxy,
     int host_routing_id)
     : host_routing_id_(host_routing_id),
       last_route_id_(0),
       last_output_surface_id_(0),
       last_host_id_(0),
       last_mailbox_valid_(false),
       ack_pending_(true),
       software_ack_pending_(false),
       opaque_(true),
       browser_plugin_(browser_plugin),
-      render_frame_(render_frame),
+      render_frame_proxy_(render_frame_proxy),
       frame_(frame) {}
 
 ChildFrameCompositingHelper::~ChildFrameCompositingHelper() {}
 
 BrowserPluginManager* ChildFrameCompositingHelper::GetBrowserPluginManager() {
   if (!browser_plugin_)
     return NULL;
 
   return browser_plugin_->browser_plugin_manager();
 }
@@ skipping 13 matching lines @@
 }
 
 void ChildFrameCompositingHelper::SendCompositorFrameSwappedACKToBrowser(
     FrameHostMsg_CompositorFrameSwappedACK_Params& params) {
   // This function will be removed when BrowserPluginManager is removed and
   // BrowserPlugin is modified to use a RenderFrame.
   if (GetBrowserPluginManager()) {
     GetBrowserPluginManager()->Send(
         new BrowserPluginHostMsg_CompositorFrameSwappedACK(
             host_routing_id_, GetInstanceID(), params));
-  } else if (render_frame_) {
-    render_frame_->Send(
+  } else if (render_frame_proxy_) {
+    render_frame_proxy_->Send(
         new FrameHostMsg_CompositorFrameSwappedACK(host_routing_id_, params));
   }
 }
 
 void ChildFrameCompositingHelper::SendBuffersSwappedACKToBrowser(
     FrameHostMsg_BuffersSwappedACK_Params& params) {
   // This function will be removed when BrowserPluginManager is removed and
   // BrowserPlugin is modified to use a RenderFrame.
   if (GetBrowserPluginManager()) {
     GetBrowserPluginManager()->Send(new BrowserPluginHostMsg_BuffersSwappedACK(
         host_routing_id_, params));
-  } else if (render_frame_) {
-    render_frame_->Send(
+  } else if (render_frame_proxy_) {
+    render_frame_proxy_->Send(
         new FrameHostMsg_BuffersSwappedACK(host_routing_id_, params));
   }
 }
 
 void ChildFrameCompositingHelper::SendReclaimCompositorResourcesToBrowser(
     FrameHostMsg_ReclaimCompositorResources_Params& params) {
   // This function will be removed when BrowserPluginManager is removed and
   // BrowserPlugin is modified to use a RenderFrame.
   if (GetBrowserPluginManager()) {
     GetBrowserPluginManager()->Send(
         new BrowserPluginHostMsg_ReclaimCompositorResources(
             host_routing_id_, GetInstanceID(), params));
-  } else if (render_frame_) {
-    render_frame_->Send(
+  } else if (render_frame_proxy_) {
+    render_frame_proxy_->Send(
         new FrameHostMsg_ReclaimCompositorResources(host_routing_id_, params));
   }
 }
 
 void ChildFrameCompositingHelper::CopyFromCompositingSurface(
     int request_id,
     gfx::Rect source_rect,
     gfx::Size dest_size) {
   CHECK(background_layer_);
   scoped_ptr<cc::CopyOutputRequest> request =
@@ skipping 34 matching lines @@
   SendCompositorFrameSwappedACKToBrowser(params);
 
   ack_pending_ = false;
 }
 
 void ChildFrameCompositingHelper::EnableCompositing(bool enable) {
   if (enable && !background_layer_.get()) {
     background_layer_ = cc::SolidColorLayer::Create();
     background_layer_->SetMasksToBounds(true);
     background_layer_->SetBackgroundColor(
-        SkColorSetARGBInline(255, 255, 255, 255));
+        SkColorSetARGBInline(255, 255, 255, 0));

[kenrb, 2014/06/20 14:28:19]

Was this just for testing?

[nasko, 2014/06/20 17:01:34]

Yes.

     web_layer_.reset(new WebLayerImpl(background_layer_));
   }
 
   if (GetContainer()) {
     GetContainer()->setWebLayer(enable ? web_layer_.get() : NULL);
   } else if (frame_) {
     frame_->setRemoteWebLayer(enable ? web_layer_.get() : NULL);
   }
 }
 
@@ skipping 358 matching lines @@
                                       dest_size.height());
   }
   if (GetBrowserPluginManager()) {
     GetBrowserPluginManager()->Send(
         new BrowserPluginHostMsg_CopyFromCompositingSurfaceAck(
             host_routing_id_, GetInstanceID(), request_id, resized_bitmap));
   }
 }
 
 }  // namespace content