Added FrameFuture class

android_webview/browser/render_thread_manager.h

 // Copyright 2014 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 ANDROID_WEBVIEW_BROWSER_RENDER_THREAD_MANAGER_H_
 #define ANDROID_WEBVIEW_BROWSER_RENDER_THREAD_MANAGER_H_
 
 #include <map>
 
 #include "android_webview/browser/compositor_frame_consumer.h"
@@ skipping 29 matching lines @@
       const scoped_refptr<base::SingleThreadTaskRunner>& ui_loop);
   ~RenderThreadManager() override;
 
   // This function can be called from any thread.
   void ClientRequestInvokeGL(bool for_idle);
 
   // CompositorFrameConsumer methods.
   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(
       ReturnedResourcesMap* returned_resource_map) override;
   bool ReturnedResourcesEmptyOnUI() const override;
   std::unique_ptr<ChildFrame> PassUncommittedFrameOnUI() override;
   bool HasFrameOnUI() const override;
   void DeleteHardwareRendererOnUI() override;
 
   // RT thread methods.
@@ skipping 28 matching lines @@
   void UpdateParentDrawConstraintsOnUI();
   bool IsInsideHardwareRelease() const;
   void SetInsideHardwareRelease(bool inside);
 
   // Accessed by UI thread.
   scoped_refptr<base::SingleThreadTaskRunner> ui_loop_;
   RenderThreadManagerClient* const client_;
   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_;
 
   // This is accessed by both UI and RT now. TODO(hush): move to RT only.
   GLViewRendererManager::Key renderer_manager_key_;
 
   // Accessed by both UI and RT thread.
   mutable base::Lock lock_;
   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_;
   base::Closure request_draw_gl_closure_;
 
   base::WeakPtrFactory<RenderThreadManager> weak_factory_on_ui_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThreadManager);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_RENDER_THREAD_MANAGER_H_