Added FrameFuture class

android_webview/browser/render_thread_manager.h

Index: android_webview/browser/render_thread_manager.h
diff --git a/android_webview/browser/render_thread_manager.h b/android_webview/browser/render_thread_manager.h
index b758526d03ad6cd939278437837cd0ac6f039344..5853e4c99c8912d3ea0cc23dce2ee4409241f459 100644
--- a/android_webview/browser/render_thread_manager.h
+++ b/android_webview/browser/render_thread_manager.h
@@ -47,7 +47,10 @@ class RenderThreadManager : public CompositorFrameConsumer {
   void SetCompositorFrameProducer(
       CompositorFrameProducer* compositor_frame_producer) override;
   void SetScrollOffsetOnUI(gfx::Vector2d scroll_offset) override;
-  void SetFrameOnUI(std::unique_ptr<ChildFrame> frame) override;
+  void SetFrameOnUI(
+      std::unique_ptr<ChildFrame> frame,
+      const scoped_refptr<content::SynchronousCompositor::FrameFuture>&
+          frame_future) override;
   void InitializeHardwareDrawIfNeededOnUI() override;
   ParentCompositorDrawConstraints GetParentDrawConstraintsOnUI() const override;
   void SwapReturnedResourcesOnUI(
@@ -96,6 +99,7 @@ class RenderThreadManager : public CompositorFrameConsumer {
   CompositorFrameProducer* compositor_frame_producer_;
   base::WeakPtr<RenderThreadManager> ui_thread_weak_ptr_;
   base::CancelableClosure request_draw_gl_cancelable_closure_;
+  void GetSynchronousCompositorFrame();

[boliu, 2016/09/28 00:36:01]

move this above "// RT thread method." as this is actually called from both
threads

[ojars, 2016/09/28 22:44:19]

Done.

 
   // Accessed by RT thread.
   std::unique_ptr<HardwareRenderer> hardware_renderer_;
@@ -108,6 +112,8 @@ class RenderThreadManager : public CompositorFrameConsumer {
   bool hardware_renderer_has_frame_;
   gfx::Vector2d scroll_offset_;
   std::unique_ptr<ChildFrame> child_frame_;
+  const bool async_on_draw_hardware_;
+  scoped_refptr<content::SynchronousCompositor::FrameFuture> frame_future_;
   bool inside_hardware_release_;
   ParentCompositorDrawConstraints parent_draw_constraints_;
   ReturnedResourcesMap returned_resources_map_;