Implement CompositorFrame Struct Traits

components/mus/gpu/display_compositor/compositor_frame_sink_impl.cc

 // Copyright 2016 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 "components/mus/gpu/display_compositor/compositor_frame_sink_impl.h"
 
 #include "cc/ipc/compositor_frame.mojom.h"
 #include "cc/surfaces/surface_factory.h"
 #include "components/mus/gpu/display_compositor/compositor_frame_sink_delegate.h"
-#include "components/mus/public/cpp/surfaces/surfaces_type_converters.h"
 
 namespace mus {
 namespace gpu {
 
 namespace {
 
 void CallCallback(
     const mojom::CompositorFrameSink::SubmitCompositorFrameCallback& callback,
     cc::SurfaceDrawStatus draw_status) {
   callback.Run(static_cast<mojom::CompositorFrameDrawStatus>(draw_status));
@@ skipping 28 matching lines @@
   needs_begin_frame_ = needs_begin_frame;
   if (begin_frame_source_) {
     if (needs_begin_frame_)
       begin_frame_source_->AddObserver(this);
     else
       begin_frame_source_->RemoveObserver(this);
   }
 }
 
 void CompositorFrameSinkImpl::SubmitCompositorFrame(
-    cc::mojom::CompositorFramePtr frame,
+    cc::CompositorFrame compositor_frame,
     const SubmitCompositorFrameCallback& callback) {
-  // TODO(fsamuel): Validate that SurfaceDrawQuad refer to allowable surface
-  // IDs.
-  std::unique_ptr<cc::CompositorFrame> compositor_frame =
-      ConvertToCompositorFrame(frame);
   gfx::Size frame_size =
-      compositor_frame->delegated_frame_data->render_pass_list.back()
+      compositor_frame.delegated_frame_data->render_pass_list.back()
           ->output_rect.size();
   if (frame_size.IsEmpty() || frame_size != last_submitted_frame_size_) {
     if (!surface_id_.is_null())
       factory_.Destroy(surface_id_);
     // TODO(fsamuel): The allocator should live on CompositorFrameSinkFactory.
     surface_id_ = delegate_->GenerateSurfaceId();
     factory_.Create(surface_id_);
     last_submitted_frame_size_ = frame_size;
   }
-  factory_.SubmitCompositorFrame(surface_id_, std::move(compositor_frame),
+  std::unique_ptr<cc::CompositorFrame> compositor_frame_copy(
+      new cc::CompositorFrame);
+  *compositor_frame_copy = std::move(compositor_frame);

[dcheng, 2016/06/27 02:05:00]

Is it possible to skip the intermediate and just move once in the call below?

Similar question below.

[Fady Samuel, 2016/06/27 03:05:10]

Yes, it is possible. I am doing that cleanup here:
https://codereview.chromium.org/2098953003/

I will land either this patch or the other first. Depending on which lands first
one will get a rebase.

+  factory_.SubmitCompositorFrame(surface_id_, std::move(compositor_frame_copy),
                                  base::Bind(&CallCallback, callback));
 }
 
 void CompositorFrameSinkImpl::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   if (!client_)
     return;
 
   client_->ReturnResources(mojo::Array<cc::ReturnedResource>::From(resources));
 }
@@ skipping 21 matching lines @@
 void CompositorFrameSinkImpl::OnBeginFrameSourcePausedChanged(bool paused) {
   // TODO(fsamuel): Implement this.
 }
 
 void CompositorFrameSinkImpl::OnConnectionLost() {
   delegate_->CompositorFrameSinkConnectionLost(sink_id_);
 }
 
 }  // namespace gpu
 }  // namespace mus