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

content/browser/android/synchronous_compositor_host.cc

 // Copyright 2015 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 "content/browser/android/synchronous_compositor_host.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
@@ skipping 101 matching lines @@
           routing_id_, params, &common_renderer_params,
           &frame.output_surface_id, frame.frame.get()))) {
     return SynchronousCompositor::Frame();
   }
   ProcessCommonParams(common_renderer_params);
   if (!frame.frame->delegated_frame_data) {
     // This can happen if compositor did not swap in this draw.
     frame.frame.reset();
   }
   if (frame.frame) {
-    UpdateFrameMetaData(frame.frame->metadata);
+    UpdateFrameMetaData(frame.frame->metadata.Clone());
   }
   return frame;
 }
 
 void SynchronousCompositorHost::UpdateFrameMetaData(
-    const cc::CompositorFrameMetadata& frame_metadata) {
-  rwhva_->SynchronousFrameMetadata(frame_metadata);
+    cc::CompositorFrameMetadata frame_metadata) {
+  rwhva_->SynchronousFrameMetadata(std::move(frame_metadata));
 }
 
 namespace {
 
 class ScopedSetSkCanvas {
  public:
   explicit ScopedSetSkCanvas(SkCanvas* canvas) {
     SynchronousCompositorSetSkCanvas(canvas);
   }
 
@@ skipping 14 matching lines @@
   ScopedSetSkCanvas set_sk_canvas(canvas);
   SyncCompositorDemandDrawSwParams params;  // Unused.
   if (!sender_->Send(new SyncCompositorMsg_DemandDrawSw(
           routing_id_, params, &success, &common_renderer_params,
           frame.get()))) {
     return false;
   }
   if (!success)
     return false;
   ProcessCommonParams(common_renderer_params);
-  UpdateFrameMetaData(frame->metadata);
+  UpdateFrameMetaData(std::move(frame->metadata));
   return true;
 }
 
 class SynchronousCompositorHost::ScopedSendZeroMemory {
  public:
   ScopedSendZeroMemory(SynchronousCompositorHost* host) : host_(host) {}
   ~ScopedSendZeroMemory() { host_->SendZeroMemory(); }
 
  private:
   SynchronousCompositorHost* const host_;
@@ skipping 45 matching lines @@
   if (!sender_->Send(new SyncCompositorMsg_DemandDrawSw(
           routing_id_, params, &success, &common_renderer_params,
           frame.get()))) {
     return false;
   }
   ScopedSendZeroMemory send_zero_memory(this);
   if (!success)
     return false;
 
   ProcessCommonParams(common_renderer_params);
-  UpdateFrameMetaData(frame->metadata);
+  UpdateFrameMetaData(std::move(frame->metadata));
 
   SkBitmap bitmap;
   if (!bitmap.installPixels(info, software_draw_shm_->shm.memory(), stride))
     return false;
 
   {
     TRACE_EVENT0("browser", "DrawBitmap");
     canvas->save();
     canvas->resetMatrix();
     canvas->drawBitmap(bitmap, 0, 0);
@@ skipping 142 matching lines @@
   if (params.page_scale_factor) {
     client_->UpdateRootLayerState(
         this, gfx::ScrollOffsetToVector2dF(params.total_scroll_offset),
         gfx::ScrollOffsetToVector2dF(params.max_scroll_offset),
         params.scrollable_size, params.page_scale_factor,
         params.min_page_scale_factor, params.max_page_scale_factor);
   }
 }
 
 }  // namespace content