Make cc::CompositorFrames movable [Part 1 of 2]

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 92 matching lines @@
   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_output_surface_id_ = child_frame->output_surface_id;
   ReturnResourcesInChildFrame();
   child_frame_ = std::move(child_frame);
-  DCHECK(child_frame_->frame.get());
+  DCHECK(child_frame_->frame);
   DCHECK(!child_frame_->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() && child_frame_->frame) {
     if (!compositor_id_.Equals(child_frame_->compositor_id) ||
         last_submitted_output_surface_id_ != child_frame_->output_surface_id) {
       if (!root_id_.is_null())
         surface_factory_->Destroy(root_id_);
       if (!child_id_.is_null())
         surface_factory_->Destroy(child_id_);
 
       root_id_ = cc::SurfaceId();
       child_id_ = cc::SurfaceId();
 
       // This will return all the resources to the previous compositor.
       surface_factory_.reset();
       compositor_id_ = child_frame_->compositor_id;
       last_submitted_output_surface_id_ = child_frame_->output_surface_id;
       surface_factory_.reset(
           new cc::SurfaceFactory(surface_manager_.get(), this));
     }
 
-    std::unique_ptr<cc::CompositorFrame> child_compositor_frame =
-        std::move(child_frame_->frame);
+    std::unique_ptr<cc::CompositorFrame> child_compositor_frame(
+        new cc::CompositorFrame);
+    *child_compositor_frame = std::move(*child_frame_->frame);
 
     // On Android we put our browser layers in physical pixels and set our
     // browser CC device_scale_factor to 1, so suppress the transform between
     // DIP and pixels.
     child_compositor_frame->delegated_frame_data->device_scale_factor = 1.0f;
 
     gfx::Size frame_size =
         child_compositor_frame->delegated_frame_data->render_pass_list.back()
             ->output_rect.size();
     bool size_changed = frame_size != frame_size_;
@@ skipping 46 matching lines @@
   quad_state->opacity = 1.f;
 
   cc::SurfaceDrawQuad* surface_quad =
       render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
   surface_quad->SetNew(quad_state, gfx::Rect(quad_state->quad_layer_bounds),
                        gfx::Rect(quad_state->quad_layer_bounds), child_id_);
 
   std::unique_ptr<cc::DelegatedFrameData> delegated_frame(
       new cc::DelegatedFrameData);
   delegated_frame->render_pass_list.push_back(std::move(render_pass));
-  std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
+  std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame());
   frame->delegated_frame_data = std::move(delegated_frame);
 
   if (root_id_.is_null()) {
     root_id_ = surface_id_allocator_->GenerateId();
     surface_factory_->Create(root_id_);
     display_->SetSurfaceId(root_id_, 1.f);
   }
   surface_factory_->SubmitCompositorFrame(root_id_, std::move(frame),
                                           cc::SurfaceFactory::DrawCallback());
 
@@ skipping 14 matching lines @@
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Hook this up.
 }
 
 void HardwareRenderer::SetBackingFrameBufferObject(
     int framebuffer_binding_ext) {
   gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext);
 }
 
 void HardwareRenderer::ReturnResourcesInChildFrame() {
-  if (child_frame_.get() && child_frame_->frame.get()) {
+  if (child_frame_.get() && child_frame_->frame) {
     cc::ReturnedResourceArray resources_to_return;
     cc::TransferableResource::ReturnResources(
         child_frame_->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_->output_surface_id);
   }
   child_frame_.reset();
 }
 
 void HardwareRenderer::ReturnResourcesToCompositor(
     const cc::ReturnedResourceArray& resources,
     const CompositorID& compositor_id,
     uint32_t output_surface_id) {
   if (output_surface_id != last_committed_output_surface_id_)
     return;
   render_thread_manager_->InsertReturnedResourcesOnRT(resources, compositor_id,
                                                       output_surface_id);
 }
 
 }  // namespace android_webview