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

content/browser/android/synchronous_compositor_host.cc

Index: content/browser/android/synchronous_compositor_host.cc
diff --git a/content/browser/android/synchronous_compositor_host.cc b/content/browser/android/synchronous_compositor_host.cc
index a8a4de02f76bbb1eb773dd20c97c46ff2d249c9a..e91f32fea5b4fe5d88c5ebd83b3b04832c70c06c 100644
--- a/content/browser/android/synchronous_compositor_host.cc
+++ b/content/browser/android/synchronous_compositor_host.cc
@@ -106,11 +106,11 @@ SynchronousCompositor::Frame SynchronousCompositorHost::DemandDrawHw(
                                           clip, viewport_rect_for_tile_priority,
                                           transform_for_tile_priority);
   SynchronousCompositor::Frame frame;
-  frame.frame.reset(new cc::CompositorFrame);
+  frame.frame = cc::CompositorFrame::Create();
   SyncCompositorCommonRendererParams common_renderer_params;
   if (!sender_->Send(new SyncCompositorMsg_DemandDrawHw(
           routing_id_, params, &common_renderer_params,
-          &frame.output_surface_id, frame.frame.get()))) {
+          &frame.output_surface_id, &frame.frame))) {
     return SynchronousCompositor::Frame();
   }
   ProcessCommonParams(common_renderer_params);
@@ -150,12 +150,11 @@ class ScopedSetSkCanvas {
 bool SynchronousCompositorHost::DemandDrawSwInProc(SkCanvas* canvas) {
   SyncCompositorCommonRendererParams common_renderer_params;
   bool success = false;
-  std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
+  std::unique_ptr<cc::CompositorFrame> frame(cc::CompositorFrame::Create());

[danakj, 2016/06/23 20:34:41]

just allocate this on the stack, since ownership never leaves

   ScopedSetSkCanvas set_sk_canvas(canvas);
   SyncCompositorDemandDrawSwParams params;  // Unused.
   if (!sender_->Send(new SyncCompositorMsg_DemandDrawSw(
-          routing_id_, params, &success, &common_renderer_params,
-          frame.get()))) {
+          routing_id_, params, &success, &common_renderer_params, &frame))) {
     return false;
   }
   if (!success)
@@ -214,12 +213,11 @@ bool SynchronousCompositorHost::DemandDrawSw(SkCanvas* canvas) {
   if (!software_draw_shm_)
     return false;
 
-  std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
+  std::unique_ptr<cc::CompositorFrame> frame(cc::CompositorFrame::Create());

[danakj, 2016/06/23 20:34:41]

ditto

   SyncCompositorCommonRendererParams common_renderer_params;
   bool success = false;
   if (!sender_->Send(new SyncCompositorMsg_DemandDrawSw(
-          routing_id_, params, &success, &common_renderer_params,
-          frame.get()))) {
+          routing_id_, params, &success, &common_renderer_params, &frame))) {
     return false;
   }
   ScopedSendZeroMemory send_zero_memory(this);