Added FrameFuture class

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 80 matching lines @@
     IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_CompositorFrameSinkCreated,
                         CompositorFrameSinkCreated)
     IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_UpdateState, ProcessCommonParams)
     IPC_MESSAGE_HANDLER_GENERIC(SyncCompositorHostMsg_ReturnFrame,
                                 DemandDrawHwReceiveFrame(message))
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void SynchronousCompositorHost::DemandDrawHwAsync(
+scoped_refptr<SynchronousCompositor::FrameFuture>
+SynchronousCompositorHost::DemandDrawHwAsync(
     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 SyncCompositorMsg_DemandDrawHwAsync(routing_id_, params));
+
+  frame_future_ = new SynchronousCompositor::FrameFuture();
+  return frame_future_;
 }
 
-SynchronousCompositor::Frame SynchronousCompositorHost::DemandDrawHw(
+scoped_refptr<SynchronousCompositor::FrameFuture>
+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);
   uint32_t compositor_frame_sink_id;
   cc::CompositorFrame compositor_frame;
   SyncCompositorCommonRendererParams common_renderer_params;
 
   if (!sender_->Send(new SyncCompositorMsg_DemandDrawHw(
           routing_id_, params, &common_renderer_params,
           &compositor_frame_sink_id, &compositor_frame))) {
-    return SynchronousCompositor::Frame();
+    //    return SynchronousCompositor::Frame();
+    return nullptr;
   }
 
   ProcessCommonParams(common_renderer_params);
 
-  return ProcessHardwareFrame(compositor_frame_sink_id,
-                              std::move(compositor_frame));
+  frame_future_ = new SynchronousCompositor::FrameFuture();
+  frame_future_->setFrame(ProcessHardwareFrame(compositor_frame_sink_id,
+                                               std::move(compositor_frame)));
+
+  return frame_future_;
 }
 
 bool SynchronousCompositorHost::DemandDrawHwReceiveFrame(
     const IPC::Message& message) {
   SyncCompositorHostMsg_ReturnFrame::Param param;
   if (!SyncCompositorHostMsg_ReturnFrame::Read(&message, &param))
     return false;
-  uint32_t compositor_frame_sink_id = std::get<0>(param);
-  cc::CompositorFrame compositor_frame = std::move(std::get<1>(param));
-  client_->OnDrawHardwareProcessFrame(ProcessHardwareFrame(
-      compositor_frame_sink_id, std::move(compositor_frame)));
+
+  // uint32_t compositor_frame_sink_id = std::get<0>(param);
+  // cc::CompositorFrame compositor_frame = std::move(std::get<1>(param));
+  // TODO(ojars):
+  // client_->OnDrawHardwareProcessFrame(
+  // ProcessHardwareFrame(compositor_frame_sink_id,
+  // std::move(compositor_frame)));
   return true;
 }
 
-SynchronousCompositor::Frame SynchronousCompositorHost::ProcessHardwareFrame(
+std::unique_ptr<SynchronousCompositor::Frame>
+SynchronousCompositorHost::ProcessHardwareFrame(
     uint32_t compositor_frame_sink_id,
     cc::CompositorFrame compositor_frame) {
-  SynchronousCompositor::Frame frame;
-  frame.frame.reset(new cc::CompositorFrame);
-  frame.compositor_frame_sink_id = compositor_frame_sink_id;
-  *frame.frame = std::move(compositor_frame);
-  if (!frame.frame->delegated_frame_data) {
+  auto frame = base::MakeUnique<SynchronousCompositor::Frame>();

[boliu, 2016/09/20 00:27:56]

Don't use auto here

[ojars, 2016/09/22 18:21:38]

Done.

+  //  SynchronousCompositor::Frame frame;
+  frame->frame.reset(new cc::CompositorFrame);
+  frame->compositor_frame_sink_id = compositor_frame_sink_id;
+  *(frame->frame) = std::move(compositor_frame);
+  if (!frame->frame->delegated_frame_data) {
     // This can happen if compositor did not swap in this draw.
-    frame.frame.reset();
+    frame->frame.reset();
   }
-  if (frame.frame) {
-    UpdateFrameMetaData(frame.frame->metadata.Clone());
+  if (frame->frame) {
+    UpdateFrameMetaData(frame->frame->metadata.Clone());
   }
+  //  return base::MakeUnique<SynchronousCompositor::Frame>(frame);
   return frame;
 }
 
 void SynchronousCompositorHost::UpdateFrameMetaData(
     cc::CompositorFrameMetadata frame_metadata) {
   rwhva_->SynchronousFrameMetadata(std::move(frame_metadata));
 }
 
 namespace {
 
@@ skipping 245 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