Added FrameFuture class

android_webview/browser/browser_view_renderer.cc

Index: android_webview/browser/browser_view_renderer.cc
diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc
index ba3defa6fa867c16a79348e24e3f270ea2f22f0a..4e823c8b52f5c10a66c66c04ac65ccdc72663464 100644
--- a/android_webview/browser/browser_view_renderer.cc
+++ b/android_webview/browser/browser_view_renderer.cc
@@ -240,35 +240,42 @@ bool BrowserViewRenderer::OnDrawHardware() {
 
   content::SynchronousCompositor::Frame frame = compositor_->DemandDrawHw(
       size_, viewport_rect_for_tile_priority, transform_for_tile_priority);
+

[boliu, 2016/09/22 23:05:31]

nit: remove new blank line

[ojars, 2016/09/28 00:17:58]

Done.

   if (!frame.frame) {
     TRACE_EVENT_INSTANT0("android_webview", "NoNewFrame",
                          TRACE_EVENT_SCOPE_THREAD);
     return current_compositor_frame_consumer_->HasFrameOnUI();
   }
 
-  OnDrawHardwareProcessFrame(std::move(frame));
+  std::unique_ptr<ChildFrame> child_frame = base::MakeUnique<ChildFrame>(
+      frame.compositor_frame_sink_id, std::move(frame.frame), compositor_id_,
+      viewport_rect_for_tile_priority.IsEmpty(), transform_for_tile_priority,
+      offscreen_pre_raster_, external_draw_constraints_.is_layer);
+
+  ReturnUnusedResource(
+      current_compositor_frame_consumer_->PassUncommittedFrameOnUI());
+  current_compositor_frame_consumer_->SetFrameOnUI(std::move(child_frame));
+
   return true;
 }
 
-void BrowserViewRenderer::OnDrawHardwareProcessFrame(
-    content::SynchronousCompositor::Frame frame) {
-  TRACE_EVENT0("android_webview",
-               "BrowserViewRenderer::OnDrawHardwareProcessFrame");
-  if (!frame.frame)
-    return;
-
+void BrowserViewRenderer::OnDrawHardwareProcessFrameFuture(
+    const scoped_refptr<content::SynchronousCompositor::FrameFuture>&
+        frame_future) {
   gfx::Transform transform_for_tile_priority =
       external_draw_constraints_.transform;
   gfx::Rect viewport_rect_for_tile_priority =
       ComputeViewportRectForTilePriority();
-  std::unique_ptr<ChildFrame> child_frame = base::MakeUnique<ChildFrame>(
-      frame.compositor_frame_sink_id, std::move(frame.frame), compositor_id_,
-      viewport_rect_for_tile_priority.IsEmpty(), transform_for_tile_priority,
-      offscreen_pre_raster_, external_draw_constraints_.is_layer);
 
   ReturnUnusedResource(
       current_compositor_frame_consumer_->PassUncommittedFrameOnUI());
-  current_compositor_frame_consumer_->SetFrameOnUI(std::move(child_frame));
+
+  current_compositor_frame_consumer_->SetFrameFutureOnUI(
+      std::move(frame_future));

[boliu, 2016/09/22 23:05:31]

don't need move here I think

[ojars, 2016/09/28 00:17:58]

Done.

+  current_compositor_frame_consumer_->SetFrameOnUI(base::MakeUnique<ChildFrame>(
+      0, nullptr, compositor_id_, viewport_rect_for_tile_priority.IsEmpty(),
+      transform_for_tile_priority, offscreen_pre_raster_,
+      external_draw_constraints_.is_layer));
 }
 
 gfx::Rect BrowserViewRenderer::ComputeViewportRectForTilePriority() {