Added FrameFuture class

content/browser/android/synchronous_compositor_host.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_SYNCHRONOUS_COMPOSITOR_HOST_H_
 #define CONTENT_BROWSER_ANDROID_SYNCHRONOUS_COMPOSITOR_HOST_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "cc/output/compositor_frame.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gfx/geometry/size_f.h"
 
 namespace IPC {
 class Message;
@@ skipping 23 matching lines @@
 
 class SynchronousCompositorHost : public SynchronousCompositor {
  public:
   static std::unique_ptr<SynchronousCompositorHost> Create(
       RenderWidgetHostViewAndroid* rwhva,
       WebContents* web_contents);
 
   ~SynchronousCompositorHost() override;
 
   // SynchronousCompositor overrides.
-  SynchronousCompositor::Frame DemandDrawHw(
+  scoped_refptr<SynchronousCompositor::FrameFuture> DemandDrawHw(
       const gfx::Size& viewport_size,
       const gfx::Rect& viewport_rect_for_tile_priority,
       const gfx::Transform& transform_for_tile_priority) override;
-  void DemandDrawHwAsync(
+  scoped_refptr<SynchronousCompositor::FrameFuture> DemandDrawHwAsync(

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

leave this void for now, if you are not using the return value yet in this CL

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

Done.

       const gfx::Size& viewport_size,
       const gfx::Rect& viewport_rect_for_tile_priority,
       const gfx::Transform& transform_for_tile_priority) override;
   bool DemandDrawSw(SkCanvas* canvas) override;
   void ReturnResources(uint32_t compositor_frame_sink_id,
                        const cc::ReturnedResourceArray& resources) override;
   void SetMemoryPolicy(size_t bytes_limit) override;
   void DidChangeRootLayerScrollOffset(
       const gfx::ScrollOffset& root_offset) override;
   void SynchronouslyZoomBy(float zoom_delta, const gfx::Point& anchor) override;
@@ skipping 16 matching lines @@
   friend class SynchronousCompositorBase;
 
   SynchronousCompositorHost(RenderWidgetHostViewAndroid* rwhva,
                             SynchronousCompositorClient* client,
                             bool use_in_proc_software_draw);
   void UpdateFrameMetaData(cc::CompositorFrameMetadata frame_metadata);
   void CompositorFrameSinkCreated();
   bool DemandDrawSwInProc(SkCanvas* canvas);
   void SetSoftwareDrawSharedMemoryIfNeeded(size_t stride, size_t buffer_size);
   void SendZeroMemory();
-  SynchronousCompositor::Frame ProcessHardwareFrame(
+  std::unique_ptr<SynchronousCompositor::Frame> ProcessHardwareFrame(
       uint32_t compositor_frame_sink_id,
       cc::CompositorFrame compositor_frame);
   bool DemandDrawHwReceiveFrame(const IPC::Message& message);
 
   RenderWidgetHostViewAndroid* const rwhva_;
   SynchronousCompositorClient* const client_;
   const scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
   const int process_id_;
   const int routing_id_;
   SynchronousCompositorObserver* const rph_observer_;
   IPC::Sender* const sender_;
   const bool use_in_process_zero_copy_software_draw_;
 
   size_t bytes_limit_;
   std::unique_ptr<SharedMemoryWithSize> software_draw_shm_;
+  scoped_refptr<SynchronousCompositor::FrameFuture> frame_future_;

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

you don't need this

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

Done.

 
   // Updated by both renderer and browser.
   gfx::ScrollOffset root_scroll_offset_;
 
   // From renderer.
   uint32_t renderer_param_version_;
   bool need_animate_scroll_;
   uint32_t need_invalidate_count_;
   uint32_t did_activate_pending_tree_count_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_SYNCHRONOUS_COMPOSITOR_HOST_H_