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 214 matching lines @@
 
   ReturnResourceFromParent(current_compositor_frame_consumer_);
   UpdateMemoryPolicy();
 
   gfx::Transform transform_for_tile_priority =
       external_draw_constraints_.transform;
 
   gfx::Rect viewport_rect_for_tile_priority =
       ComputeViewportRectForTilePriority();
 
+  scoped_refptr<content::SynchronousCompositor::FrameFuture> frame_future;
+
   if (async_on_draw_hardware_) {
-    compositor_->DemandDrawHwAsync(size_, viewport_rect_for_tile_priority,
-                                   transform_for_tile_priority);
-    return current_compositor_frame_consumer_->HasFrameOnUI();
+    frame_future = compositor_->DemandDrawHwAsync(
+        size_, viewport_rect_for_tile_priority, transform_for_tile_priority);
+    //    return current_compositor_frame_consumer_->HasFrameOnUI();

[boliu, 2016/09/16 16:26:11]

why is this commented out?

[ojars, 2016/09/19 22:02:36]

Changed back.

[ojars, 2016/09/19 22:02:36]

Done.

+  } else {
+    frame_future = compositor_->DemandDrawHw(
+        size_, viewport_rect_for_tile_priority, transform_for_tile_priority);
   }
 
-  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();
-  }
+  //  if (!frame.frame) {

[boliu, 2016/09/16 16:26:11]

why is this commented out?

[ojars, 2016/09/19 22:02:36]

Changed back.

[ojars, 2016/09/19 22:02:36]

Done.

+  //    TRACE_EVENT_INSTANT0("android_webview", "NoNewFrame",
+  //                         TRACE_EVENT_SCOPE_THREAD);
+  //    return current_compositor_frame_consumer_->HasFrameOnUI();
+  //  }
 
-  OnDrawHardwareProcessFrame(std::move(frame));
+  OnDrawHardwareProcessFrame(std::move(frame_future));
   return true;
 }
 
-void BrowserViewRenderer::OnDrawHardwareProcessFrame(
-    content::SynchronousCompositor::Frame frame) {
-  TRACE_EVENT0("android_webview",
-               "BrowserViewRenderer::OnDrawHardwareProcessFrame");
-  if (!frame.frame)
-    return;
-
+std::unique_ptr<ChildFrame> BrowserViewRenderer::CreateChildFrame(

[boliu, 2016/09/16 16:26:11]

there is only one caller for this method, just inline it in
OnDrawHardwareProcessFrame

[ojars, 2016/09/19 22:02:36]

Done.

+    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.output_surface_id, std::move(frame.frame), compositor_id_,
+  gfx::Rect viewport_rect_for_tile_priority;
+
+  if (!offscreen_pre_raster_ && !external_draw_constraints_.is_layer) {
+    viewport_rect_for_tile_priority = last_on_draw_global_visible_rect_;
+  }
+
+  return base::MakeUnique<ChildFrame>(
+      std::move(frame_future), compositor_id_,
       viewport_rect_for_tile_priority.IsEmpty(), transform_for_tile_priority,
       offscreen_pre_raster_, external_draw_constraints_.is_layer);
+}
+
+void BrowserViewRenderer::OnDrawHardwareProcessFrame(
+    scoped_refptr<content::SynchronousCompositor::FrameFuture> frame_future) {
+  std::unique_ptr<ChildFrame> child_frame =
+      CreateChildFrame(std::move(frame_future));
 
   ReturnUnusedResource(
       current_compositor_frame_consumer_->PassUncommittedFrameOnUI());
+
   current_compositor_frame_consumer_->SetFrameOnUI(std::move(child_frame));
 }
 
 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;
 
@@ skipping 25 matching lines @@
   // At this point the compositor frame consumer has to hand back all resources
   // to the child compositor.
   compositor_frame_consumer->DeleteHardwareRendererOnUI();
   ReturnUnusedResource(compositor_frame_consumer->PassUncommittedFrameOnUI());
   ReturnResourceFromParent(compositor_frame_consumer);
   compositor_frame_consumer->SetCompositorFrameProducer(nullptr);
 }
 
 void BrowserViewRenderer::ReturnUnusedResource(
     std::unique_ptr<ChildFrame> child_frame) {
-  if (!child_frame.get() || !child_frame->frame.get())
+  //  if (!child_frame.get() || !child_frame->frame.get())

[boliu, 2016/09/16 16:26:11]

remove?

[ojars, 2016/09/19 22:02:36]

Done.

+  if (!child_frame.get() || !child_frame->frame_future->hasFrame())
     return;
 
   cc::ReturnedResourceArray resources;
   cc::TransferableResource::ReturnResources(
-      child_frame->frame->delegated_frame_data->resource_list, &resources);
+      child_frame->frame_future->getFrame()
+          ->frame->delegated_frame_data->resource_list,
+      &resources);
   content::SynchronousCompositor* compositor =
       FindCompositor(child_frame->compositor_id);
   if (compositor && !resources.empty())
-    compositor->ReturnResources(child_frame->output_surface_id, resources);
+    compositor->ReturnResources(
+        child_frame->frame_future->getFrame()->output_surface_id, resources);
 }
 
 void BrowserViewRenderer::ReturnResourceFromParent(
     CompositorFrameConsumer* compositor_frame_consumer) {
   CompositorFrameConsumer::ReturnedResourcesMap returned_resource_map;
   compositor_frame_consumer->SwapReturnedResourcesOnUI(&returned_resource_map);
   for (auto& pair : returned_resource_map) {
     CompositorID compositor_id = pair.first;
     content::SynchronousCompositor* compositor = FindCompositor(compositor_id);
     cc::ReturnedResourceArray resources;
@@ skipping 429 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