Added FrameFuture class

android_webview/browser/hardware_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/hardware_renderer.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/aw_render_thread_context_provider.h"
@@ skipping 45 matching lines @@
 }
 
 void HardwareRenderer::CommitFrame() {
   TRACE_EVENT0("android_webview", "CommitFrame");
   scroll_offset_ = render_thread_manager_->GetScrollOffsetOnRT();
   std::unique_ptr<ChildFrame> child_frame =
       render_thread_manager_->PassFrameOnRT();
   if (!child_frame.get())
     return;
 
-  last_committed_compositor_frame_sink_id_ =
-      child_frame->compositor_frame_sink_id;
+  // Wait for frame, then extract CompositorFrame and

[boliu, 2016/09/20 00:27:56]

I think HardwareRenderer do not need to be aware of FrameFuture at all. Let's do
the waiting in RenderThreadManager instead.

[ojars, 2016/09/22 18:21:38]

Done.

+  // compositor_frame_sink_id_.
+  child_frame->frame_future->Wait();
+  frame_ = std::move(child_frame->frame_future->getFrame()->frame);
+  compositor_frame_sink_id_ =
+      child_frame->frame_future->getFrame()->compositor_frame_sink_id;
+
+  last_committed_compositor_frame_sink_id_ = compositor_frame_sink_id_;
   ReturnResourcesInChildFrame();
   child_frame_ = std::move(child_frame);
-  DCHECK(child_frame_->frame.get());
-  DCHECK(!child_frame_->frame->gl_frame_data);
+  DCHECK(frame_.get());
+  DCHECK(!frame_->gl_frame_data);
 }
 
 void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info,
                               const ScopedAppGLStateRestore& gl_state) {
   TRACE_EVENT0("android_webview", "HardwareRenderer::DrawGL");
 
   // We need to watch if the current Android context has changed and enforce
   // a clean-up in the compositor.
   EGLContext current_context = eglGetCurrentContext();
   DCHECK(current_context) << "DrawGL called without EGLContext";
 
   // TODO(boliu): Handle context loss.
   if (last_egl_context_ != current_context)
     DLOG(WARNING) << "EGLContextChanged";
 
   // SurfaceFactory::SubmitCompositorFrame might call glFlush. So calling it
   // during "kModeSync" stage (which does not allow GL) might result in extra
   // kModeProcess. Instead, submit the frame in "kModeDraw" stage to avoid
   // unnecessary kModeProcess.
-  if (child_frame_.get() && child_frame_->frame.get()) {
+  if (child_frame_.get() && frame_.get()) {
     if (!compositor_id_.Equals(child_frame_->compositor_id) ||
-        last_submitted_compositor_frame_sink_id_ !=
-            child_frame_->compositor_frame_sink_id) {
+        last_submitted_compositor_frame_sink_id_ != compositor_frame_sink_id_) {
       if (!child_id_.is_null())
         DestroySurface();
 
       // This will return all the resources to the previous compositor.
       surface_factory_.reset();
       compositor_id_ = child_frame_->compositor_id;
-      last_submitted_compositor_frame_sink_id_ =
-          child_frame_->compositor_frame_sink_id;
+      last_submitted_compositor_frame_sink_id_ = compositor_frame_sink_id_;
       surface_factory_.reset(
           new cc::SurfaceFactory(surfaces_->GetSurfaceManager(), this));
     }
 
     std::unique_ptr<cc::CompositorFrame> child_compositor_frame =
-        std::move(child_frame_->frame);
+        std::move(frame_);
 
     gfx::Size frame_size =
         child_compositor_frame->delegated_frame_data->render_pass_list.back()
             ->output_rect.size();
     bool size_changed = frame_size != frame_size_;
     frame_size_ = frame_size;
     if (child_id_.is_null() || size_changed) {
       if (!child_id_.is_null())
         DestroySurface();
       AllocateSurface();
@@ skipping 55 matching lines @@
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Hook this up.
 }
 
 void HardwareRenderer::SetBackingFrameBufferObject(
     int framebuffer_binding_ext) {
   surfaces_->SetBackingFrameBufferObject(framebuffer_binding_ext);
 }
 
 void HardwareRenderer::ReturnResourcesInChildFrame() {
-  if (child_frame_.get() && child_frame_->frame.get()) {
+  if (child_frame_.get() && frame_.get()) {
     cc::ReturnedResourceArray resources_to_return;
     cc::TransferableResource::ReturnResources(
-        child_frame_->frame->delegated_frame_data->resource_list,
-        &resources_to_return);
+        frame_->delegated_frame_data->resource_list, &resources_to_return);
 
     // The child frame's compositor id is not necessarily same as
     // compositor_id_.
     ReturnResourcesToCompositor(resources_to_return,
                                 child_frame_->compositor_id,
-                                child_frame_->compositor_frame_sink_id);
+                                compositor_frame_sink_id_);
   }
   child_frame_.reset();
 }
 
 void HardwareRenderer::ReturnResourcesToCompositor(
     const cc::ReturnedResourceArray& resources,
     const CompositorID& compositor_id,
     uint32_t compositor_frame_sink_id) {
   if (compositor_frame_sink_id != last_committed_compositor_frame_sink_id_)
     return;
   render_thread_manager_->InsertReturnedResourcesOnRT(resources, compositor_id,
                                                       compositor_frame_sink_id);
 }
 
 }  // namespace android_webview