Aura: Browser-side changes for Composite-To-Mailbox

content/browser/renderer_host/render_widget_host_impl.cc

 // Copyright (c) 2012 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/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "cc/compositor_frame.h"
+#include "cc/switches.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/renderer_host/backing_store.h"
 #include "content/browser/renderer_host/backing_store_manager.h"
 #include "content/browser/renderer_host/gesture_event_filter.h"
 #include "content/browser/renderer_host/overscroll_controller.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_helper.h"
@@ skipping 1489 matching lines @@
     view_->UpdateFrameInfo(
         gfx::ToRoundedVector2d(scroll_offset),
         frame.metadata.page_scale_factor,
         frame.metadata.min_page_scale_factor,
         frame.metadata.max_page_scale_factor,
         gfx::ToCeiledSize(content_size),
         frame.metadata.location_bar_offset,
         frame.metadata.location_bar_content_translation);
   }
 #endif
+  if (view_)
+    view_->OnSwapCompositorFrame(frame, process_->GetID(), routing_id_);
 }
 
 void RenderWidgetHostImpl::OnUpdateRect(
     const ViewHostMsg_UpdateRect_Params& params) {
   TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnUpdateRect");
   TimeTicks paint_start = TimeTicks::Now();
 
   // Update our knowledge of the RenderWidget's size.
   current_size_ = params.view_size;
   // Update our knowledge of the RenderWidget's scroll offset.
@@ skipping 777 matching lines @@
       Send(new ViewMsg_LockMouse_ACK(routing_id_, true));
       return true;
     }
   }
 }
 
 // static
 void RenderWidgetHostImpl::AcknowledgeBufferPresent(
     int32 route_id, int gpu_host_id,
     const AcceleratedSurfaceMsg_BufferPresented_Params& params) {
+  static bool composite_to_mailbox =
+    CommandLine::ForCurrentProcess()->HasSwitch(
+        cc::switches::kCompositeToMailbox);

[piman, 2013/01/18 02:14:11]

This is a bit of a hack. At the call site, depending on the path, the renderer
id got shoved into the gpu id, and then, based on the command-line flag, we
decide how to interpret it.
How about having 2 methods AcknowledgeBufferPresentToGpu vs
AcknowledgeBufferPresentToRenderer, the latter one doesn't even need the route
id or the host id (they're members of this class, you passed them up there in
OnSwapCompositorFrame)

[no sievers, 2013/02/06 23:36:00]

Note that the method needs to be static though. But I've cleaned this up
regardless. This also makes it easier to return the size of the texture being
returned, which allows me to get rid of the ack tracking in the renderer.

+
+  if (composite_to_mailbox) {
+    // We will return the texture to the renderer.
+    cc::CompositorFrameAck ack;
+    std::copy(params.mailbox_name.data(),
+              params.mailbox_name.data() + params.mailbox_name.length(),
+              reinterpret_cast<char*>(ack.mailbox.name));
+    ack.sync_point = params.sync_point;
+    RenderProcessHost* host = RenderProcessHost::FromID(gpu_host_id);
+    host->Send(new ViewMsg_SwapCompositorFrameAck(route_id, ack));
+    return;
+  }
+
   GpuProcessHostUIShim* ui_shim = GpuProcessHostUIShim::FromID(gpu_host_id);
   if (ui_shim) {
     ui_shim->Send(new AcceleratedSurfaceMsg_BufferPresented(route_id,
                                                             params));
   }
 }
 
 void RenderWidgetHostImpl::AcknowledgeSwapBuffersToRenderer() {
   if (!is_threaded_compositing_enabled_)
     Send(new ViewMsg_SwapBuffers_ACK(routing_id_));
@@ skipping 25 matching lines @@
     return;
 
   OnRenderAutoResized(new_size);
 }
 
 void RenderWidgetHostImpl::DetachDelegate() {
   delegate_ = NULL;
 }
 
 }  // namespace content