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

cc/surfaces/surface_display_output_surface.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 "cc/surfaces/surface_display_output_surface.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/surfaces/display.h"
@@ skipping 58 matching lines @@
     }
     delegated_surface_id_ = surface_id_allocator_->GenerateId();
     factory_.Create(delegated_surface_id_);
     last_swap_frame_size_ = frame_size;
   }
   display_->SetSurfaceId(delegated_surface_id_,
                          frame.metadata.device_scale_factor);
 
   client_->DidSwapBuffers();
 
+  std::unique_ptr<CompositorFrame> frame_copy(new CompositorFrame);
+  *frame_copy = std::move(frame);
   factory_.SubmitCompositorFrame(
-      delegated_surface_id_, std::move(frame),
+      delegated_surface_id_, std::move(frame_copy),
       base::Bind(&SurfaceDisplayOutputSurface::SwapBuffersComplete,
                  base::Unretained(this)));
 }
 
 bool SurfaceDisplayOutputSurface::BindToClient(OutputSurfaceClient* client) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   surface_manager_->RegisterSurfaceFactoryClient(
       surface_id_allocator_->id_namespace(), this);
 
   if (!OutputSurface::BindToClient(client))
     return false;
 
   // We want the Display's output surface to hear about lost context, and since
   // this shares a context with it, we should not be listening for lost context
   // callbacks on the context here.
   if (context_provider())
     context_provider()->SetLostContextCallback(base::Closure());
 
   // Avoid initializing GL context here, as this should be sharing the
   // Display's context.
   display_->Initialize(this);
   return true;
 }
 
 void SurfaceDisplayOutputSurface::ForceReclaimResources() {
   if (!delegated_surface_id_.is_null()) {
-    factory_.SubmitCompositorFrame(delegated_surface_id_, CompositorFrame(),
+    factory_.SubmitCompositorFrame(delegated_surface_id_, nullptr,
                                    SurfaceFactory::DrawCallback());
   }
 }
 
 void SurfaceDisplayOutputSurface::DetachFromClient() {
   DCHECK(HasClient());
   // Unregister the SurfaceFactoryClient here instead of the dtor so that only
   // one client is alive for this namespace at any given time.
   surface_manager_->UnregisterSurfaceFactoryClient(
       surface_id_allocator_->id_namespace());
@@ skipping 38 matching lines @@
   SetMemoryPolicy(policy);
 }
 
 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) {
   // TODO(danakj): Why the lost check?
   if (!output_surface_lost_)
     client_->DidSwapBuffersComplete();
 }
 
 }  // namespace cc