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

cc/output/gl_renderer.cc

 // Copyright 2010 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 "cc/output/gl_renderer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 2700 matching lines @@
 
 void GLRenderer::SwapBuffers(const CompositorFrameMetadata& metadata) {
   DCHECK(!is_backbuffer_discarded_);
 
   TRACE_EVENT0("cc,benchmark", "GLRenderer::SwapBuffers");
   // We're done! Time to swapbuffers!
 
   gfx::Size surface_size = output_surface_->SurfaceSize();
 
   CompositorFrame compositor_frame;
-  compositor_frame.metadata = metadata;
+  compositor_frame.metadata = CompositorFrameMetadata(metadata);

[danakj, 2016/06/24 18:35:10]

dittos

[Fady Samuel, 2016/06/24 20:00:24]

Done.

   compositor_frame.gl_frame_data = base::WrapUnique(new GLFrameData);
   compositor_frame.gl_frame_data->size = surface_size;
   if (capabilities_.using_partial_swap) {
     // If supported, we can save significant bandwidth by only swapping the
     // damaged/scissored region (clamped to the viewport).
     swap_buffer_rect_.Intersect(gfx::Rect(surface_size));
     int flipped_y_pos_of_rect_bottom = surface_size.height() -
                                        swap_buffer_rect_.y() -
                                        swap_buffer_rect_.height();
     compositor_frame.gl_frame_data->sub_buffer_rect =
@@ skipping 13 matching lines @@
   swapping_overlay_resources_.push_back(std::move(pending_overlay_resources_));
   pending_overlay_resources_.clear();
 
   // We always hold onto resources until an extra frame has swapped, to make
   // sure we don't update the buffer while it's being scanned out.
   if (!settings_->release_overlay_resources_after_gpu_query &&
       swapping_overlay_resources_.size() > 2) {
     swapping_overlay_resources_.pop_front();
   }
 
-  output_surface_->SwapBuffers(&compositor_frame);
+  output_surface_->SwapBuffers(std::move(compositor_frame));
 
   swap_buffer_rect_ = gfx::Rect();
 }
 
 void GLRenderer::SwapBuffersComplete() {
   // Once a resouce has been swap-ACKed, send a query to the GPU process to ask
   // if the resource is no longer being consumed by the system compositor. The
   // response will come with the next swap-ACK.
   if (settings_->release_overlay_resources_after_gpu_query) {
     if (!swapping_overlay_resources_.empty()) {
@@ skipping 913 matching lines @@
       texture_id = pending_overlay_resources_.back()->texture_id();
     }
 
     context_support_->ScheduleOverlayPlane(
         overlay.plane_z_order, overlay.transform, texture_id,
         ToNearestRect(overlay.display_rect), overlay.uv_rect);
   }
 }
 
 }  // namespace cc