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

content/browser/devtools/protocol/page_handler.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 "content/browser/devtools/protocol/page_handler.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 128 matching lines @@
 void PageHandler::SetClient(std::unique_ptr<Client> client) {
   client_.swap(client);
 }
 
 void PageHandler::Detached() {
   Disable();
 }
 
 void PageHandler::OnSwapCompositorFrame(
     const cc::CompositorFrameMetadata& frame_metadata) {
-  last_compositor_frame_metadata_ = frame_metadata;
+  last_compositor_frame_metadata_ = cc::CompositorFrameMetadata(frame_metadata);

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

dittos

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

Done.

   has_compositor_frame_metadata_ = true;
 
   if (screencast_enabled_)
     InnerSwapCompositorFrame();
   color_picker_->OnSwapCompositorFrame();
 }
 
 void PageHandler::OnSynchronousSwapCompositorFrame(
     const cc::CompositorFrameMetadata& frame_metadata) {
-  last_compositor_frame_metadata_ = has_compositor_frame_metadata_ ?
-      next_compositor_frame_metadata_ : frame_metadata;
-  next_compositor_frame_metadata_ = frame_metadata;
+  last_compositor_frame_metadata_ =
+      has_compositor_frame_metadata_
+          ? cc::CompositorFrameMetadata(next_compositor_frame_metadata_)

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

dittos

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

Done.

+          : cc::CompositorFrameMetadata(frame_metadata);
+  next_compositor_frame_metadata_ = cc::CompositorFrameMetadata(frame_metadata);

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

A copy needs to be made here tho, so if you make it move-only you'll need a
Clone() method or something for this.

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

I made the above Clone() and using std::move on htis.

   has_compositor_frame_metadata_ = true;
 
   if (screencast_enabled_)
     InnerSwapCompositorFrame();
   color_picker_->OnSwapCompositorFrame();
 }
 
 void PageHandler::Observe(int type,
                           const NotificationSource& source,
                           const NotificationDetails& details) {
@@ skipping 342 matching lines @@
 
 void PageHandler::OnColorPicked(int r, int g, int b, int a) {
   scoped_refptr<dom::RGBA> color =
       dom::RGBA::Create()->set_r(r)->set_g(g)->set_b(b)->set_a(a);
   client_->ColorPicked(ColorPickedParams::Create()->set_color(color));
 }
 
 }  // namespace page
 }  // namespace devtools
 }  // namespace content