OnDrawHardware() implementation with async messages

content/browser/android/synchronous_compositor_host.cc

 // Copyright 2015 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/android/synchronous_compositor_host.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
@@ skipping 72 matching lines @@
 SynchronousCompositorHost::~SynchronousCompositorHost() {
   client_->DidDestroyCompositor(this, process_id_, routing_id_);
 }
 
 bool SynchronousCompositorHost::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SynchronousCompositorHost, message)
     IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_OutputSurfaceCreated,
                         OutputSurfaceCreated)
     IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_UpdateState, ProcessCommonParams)
+    IPC_MESSAGE_HANDLER(CompositorHostMsg_Frame, DemandDrawHwReceiveFrame)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
+SynchronousCompositor::Frame SynchronousCompositorHost::DemandDrawHw_Async(
+    const gfx::Size& viewport_size,
+    const gfx::Rect& viewport_rect_for_tile_priority,
+    const gfx::Transform& transform_for_tile_priority) {
+  SyncCompositorDemandDrawHwParams params(viewport_size,
+                                          viewport_rect_for_tile_priority,
+                                          transform_for_tile_priority);
+  sender_->Send(new CompositorMsg_DemandDrawHw(routing_id_, params));
+
+  SynchronousCompositor::Frame frame;
+  return frame;
+}
+
 SynchronousCompositor::Frame SynchronousCompositorHost::DemandDrawHw(
     const gfx::Size& viewport_size,
     const gfx::Rect& viewport_rect_for_tile_priority,
     const gfx::Transform& transform_for_tile_priority) {
   SyncCompositorDemandDrawHwParams params(viewport_size,
                                           viewport_rect_for_tile_priority,
                                           transform_for_tile_priority);
   SynchronousCompositor::Frame frame;
   frame.frame.reset(new cc::CompositorFrame);
   SyncCompositorCommonRendererParams common_renderer_params;
   if (!sender_->Send(new SyncCompositorMsg_DemandDrawHw(
           routing_id_, params, &common_renderer_params,
           &frame.output_surface_id, frame.frame.get()))) {
     return SynchronousCompositor::Frame();
   }
   ProcessCommonParams(common_renderer_params);
   if (!frame.frame->delegated_frame_data) {

[boliu, 2016/08/11 19:23:39]

this code is duplicated

actually, let's do this, remove the return value from DemandDrawHw as well, and
just call DemandDrawHwReceiveFrame instead, this avoids code duplication in BVR
as well, although you'll need to keep a bit more state there

[ojars, 2016/08/23 02:15:42]

Done.

     // This can happen if compositor did not swap in this draw.
     frame.frame.reset();
   }
   if (frame.frame) {
     UpdateFrameMetaData(frame.frame->metadata.Clone());
   }
   return frame;
 }
 
+void SynchronousCompositorHost::DemandDrawHwReceiveFrame(
+    uint32_t output_surface_id,
+    const cc::CompositorFrame& compositor_frame) {
+  SynchronousCompositor::Frame frame;
+  frame.frame.reset(new cc::CompositorFrame);
+  frame.output_surface_id = output_surface_id;
+  *frame.frame = std::move(const_cast<cc::CompositorFrame&>(compositor_frame));
+  frame.output_surface_id = output_surface_id;
+
+  if (!frame.frame->delegated_frame_data) {
+    // This can happen if compositor did not swap in this draw.
+    frame.frame.reset();
+  }
+  if (frame.frame) {
+    UpdateFrameMetaData(frame.frame->metadata.Clone());
+  }
+
+  client_->OnDrawHardwareProcessFrame(std::move(frame));
+}
+
 void SynchronousCompositorHost::UpdateFrameMetaData(
     cc::CompositorFrameMetadata frame_metadata) {
   rwhva_->SynchronousFrameMetadata(std::move(frame_metadata));
 }
 
 namespace {
 
 class ScopedSetSkCanvas {
  public:
   explicit ScopedSetSkCanvas(SkCanvas* canvas) {
@@ skipping 242 matching lines @@
   if (params.page_scale_factor) {
     client_->UpdateRootLayerState(
         this, gfx::ScrollOffsetToVector2dF(params.total_scroll_offset),
         gfx::ScrollOffsetToVector2dF(params.max_scroll_offset),
         params.scrollable_size, params.page_scale_factor,
         params.min_page_scale_factor, params.max_page_scale_factor);
   }
 }
 
 }  // namespace content