Adding RenderWidgetHostViewChildFrame for OOPIF view.

content/renderer/browser_plugin/browser_plugin_compositing_helper.cc

 // Copyright (c) 2013 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/browser_plugin/browser_plugin_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_manager.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/WebPluginContainer.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
@@ skipping 39 matching lines @@
           &BrowserPluginCompositingHelper::CopyFromCompositingSurfaceHasResult,
           this,
           request_id,
           dest_size));
   request->set_area(source_rect);
   background_layer_->RequestCopyOfOutput(request.Pass());
 }
 
 void BrowserPluginCompositingHelper::DidCommitCompositorFrame() {
   if (software_ack_pending_) {
-    cc::CompositorFrameAck ack;
+    FrameHostMsg_CompositorFrameSwappedACK_Params params;
+    params.producing_host_id = last_host_id_;
+    params.producing_route_id = last_route_id_;
+    params.output_surface_id = last_output_surface_id_;
     if (!unacked_software_frames_.empty()) {
-      ack.last_software_frame_id = unacked_software_frames_.back();
+      params.ack.last_software_frame_id = unacked_software_frames_.back();
       unacked_software_frames_.pop_back();
     }
 
     browser_plugin_manager_->Send(
-        new BrowserPluginHostMsg_CompositorFrameACK(
+        new BrowserPluginHostMsg_CompositorFrameSwappedACK(
             host_routing_id_,
             instance_id_,
-            last_route_id_,
-            last_output_surface_id_,
-            last_host_id_,
-            ack));
+            params));
 
     software_ack_pending_ = false;
   }
   if (!resource_collection_.get() || !ack_pending_)
     return;
 
-  cc::CompositorFrameAck ack;
-  resource_collection_->TakeUnusedResourcesForChildCompositor(&ack.resources);
+  FrameHostMsg_CompositorFrameSwappedACK_Params params;
+  params.producing_host_id = last_host_id_;
+  params.producing_route_id = last_route_id_;
+  params.output_surface_id = last_output_surface_id_;
+  resource_collection_->TakeUnusedResourcesForChildCompositor(
+      &params.ack.resources);
 
   browser_plugin_manager_->Send(
-      new BrowserPluginHostMsg_CompositorFrameACK(
+      new BrowserPluginHostMsg_CompositorFrameSwappedACK(
           host_routing_id_,
           instance_id_,
-          last_route_id_,
-          last_output_surface_id_,
-          last_host_id_,
-          ack));
+          params));
 
   ack_pending_ = false;
 }
 
 void BrowserPluginCompositingHelper::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));
@@ skipping 49 matching lines @@
   // buffer arriving, no ACK is needed.
   if (!ack_pending_) {
     last_mailbox_valid_ = false;
     return;
   }
   ack_pending_ = false;
   switch (mailbox.type) {
     case TEXTURE_IMAGE_TRANSPORT: {
       std::string mailbox_name(reinterpret_cast<const char*>(mailbox.name.name),
                                sizeof(mailbox.name.name));
+      FrameHostMsg_BuffersSwappedACK_Params params;
+      params.gpu_host_id = mailbox.host_id;
+      params.gpu_route_id = mailbox.route_id;
+      params.mailbox_name = mailbox_name;
+      params.sync_point = sync_point;
       browser_plugin_manager_->Send(
           new BrowserPluginHostMsg_BuffersSwappedACK(
               host_routing_id_,
               instance_id_,
-              mailbox.route_id,
-              mailbox.host_id,
-              mailbox_name,
-              sync_point));
+              params));
       break;
     }
     case GL_COMPOSITOR_FRAME: {
-      cc::CompositorFrameAck ack;
-      ack.gl_frame_data.reset(new cc::GLFrameData());
-      ack.gl_frame_data->mailbox = mailbox.name;
-      ack.gl_frame_data->size = mailbox.size;
-      ack.gl_frame_data->sync_point = sync_point;
+      FrameHostMsg_CompositorFrameSwappedACK_Params params;
+      params.producing_host_id = last_host_id_;

[nasko, 2013/12/20 17:21:05]

Is this intentional that use last_host_id_ here and it used to be
mailbox.route_id? In all the cases above it is just moving the same params into
the IPC struct, but here it differs.

[awong, 2013/12/20 23:53:38]

Whoa. Nice catch!

No, that's a mistake. Fixed.

+      params.producing_route_id = last_route_id_;
+      params.output_surface_id = last_output_surface_id_;
+      params.ack.gl_frame_data.reset(new cc::GLFrameData());
+      params.ack.gl_frame_data->mailbox = mailbox.name;
+      params.ack.gl_frame_data->size = mailbox.size;
+      params.ack.gl_frame_data->sync_point = sync_point;
 
       browser_plugin_manager_->Send(
-         new BrowserPluginHostMsg_CompositorFrameACK(
+         new BrowserPluginHostMsg_CompositorFrameSwappedACK(
              host_routing_id_,
              instance_id_,
-             mailbox.route_id,
-             mailbox.output_surface_id,
-             mailbox.host_id,
-             ack));
+             params));
       break;
     }
     case SOFTWARE_COMPOSITOR_FRAME:
       break;
   }
 }
 
 void BrowserPluginCompositingHelper::OnContainerDestroy() {
   if (container_)
     container_->setWebLayer(NULL);
@@ skipping 273 matching lines @@
                        dest_size.width(),
                        dest_size.height());
   }
   browser_plugin_manager_->Send(
       new BrowserPluginHostMsg_CopyFromCompositingSurfaceAck(
           host_routing_id_, instance_id_, request_id,
           resized_bitmap));
 }
 
 }  // namespace content