Added FrameFuture class

android_webview/browser/browser_view_renderer.cc

 // 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.
 
 #include "android_webview/browser/browser_view_renderer.h"
 
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer_client.h"
 #include "android_webview/browser/child_frame.h"
@@ skipping 228 matching lines @@
   }
 
   content::SynchronousCompositor::Frame frame = compositor_->DemandDrawHw(
       size_, viewport_rect_for_tile_priority, transform_for_tile_priority);
   if (!frame.frame) {
     TRACE_EVENT_INSTANT0("android_webview", "NoNewFrame",
                          TRACE_EVENT_SCOPE_THREAD);
     return current_compositor_frame_consumer_->HasFrameOnUI();
   }
 
-  OnDrawHardwareProcessFrame(std::move(frame));
-  return true;
-}
-
-void BrowserViewRenderer::OnDrawHardwareProcessFrame(
-    content::SynchronousCompositor::Frame frame) {
-  TRACE_EVENT0("android_webview",
-               "BrowserViewRenderer::OnDrawHardwareProcessFrame");
-  if (!frame.frame)
-    return;
-
-  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_->SetFrameOnUI(std::move(child_frame),
+                                                   nullptr);
+
+  return true;
+}
+
+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();
+
+  ReturnUnusedResource(
+      current_compositor_frame_consumer_->PassUncommittedFrameOnUI());
+  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),
+      frame_future);
 }
 
 gfx::Rect BrowserViewRenderer::ComputeViewportRectForTilePriority() {
   // If the WebView is on a layer, WebView does not know what transform is
   // applied onto the layer so global visible rect does not make sense here.
   // In this case, just use the surface rect for tiling.
   // Leave viewport_rect_for_tile_priority empty if offscreen_pre_raster_ is on.
   gfx::Rect viewport_rect_for_tile_priority;
 
   if (!offscreen_pre_raster_ && !external_draw_constraints_.is_layer) {
@@ skipping 485 matching lines @@
   base::StringAppendF(&str,
                       "overscroll_rounding_error_: %s ",
                       overscroll_rounding_error_.ToString().c_str());
   base::StringAppendF(
       &str, "on_new_picture_enable: %d ", on_new_picture_enable_);
   base::StringAppendF(&str, "clear_view: %d ", clear_view_);
   return str;
 }
 
 }  // namespace android_webview