Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/surfaces/top_level_display_client.cc

 // Copyright 2015 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/view_manager/surfaces/top_level_display_client.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/display.h"
 #include "components/view_manager/gles2/gpu_state.h"
 #include "components/view_manager/surfaces/surfaces_context_provider.h"
 #include "components/view_manager/surfaces/surfaces_output_surface.h"
 #include "components/view_manager/surfaces/surfaces_scheduler.h"
 #include "components/view_manager/surfaces/surfaces_state.h"
-#include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/converters/surfaces/surfaces_type_converters.h"
 
 namespace surfaces {
 namespace {
-void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) {
+void CallCallback(const base::Closure& callback, cc::SurfaceDrawStatus status) {
   callback.Run();
 }
 }
 
 TopLevelDisplayClient::TopLevelDisplayClient(
     gfx::AcceleratedWidget widget,
     const scoped_refptr<gles2::GpuState>& gpu_state,
     const scoped_refptr<SurfacesState>& surfaces_state)
     : gpu_state_(gpu_state),
       surfaces_state_(surfaces_state),
@@ skipping 24 matching lines @@
 TopLevelDisplayClient::~TopLevelDisplayClient() {
   if (display_) {
     factory_.Destroy(cc_id_);
     surfaces_state_->scheduler()->RemoveDisplay(display_.get());
     // By deleting the object after display_ is reset, OutputSurfaceLost can
     // know not to do anything (which would result in double delete).
     delete display_.release();
   }
 }
 
-void TopLevelDisplayClient::SubmitFrame(mojo::FramePtr frame,
+void TopLevelDisplayClient::SubmitFrame(scoped_ptr<cc::CompositorFrame> frame,
                                         const base::Closure& callback) {
   DCHECK(pending_callback_.is_null());
   pending_frame_ = frame.Pass();
   pending_callback_ = callback;
   if (display_)
     Draw();
 }
 
 void TopLevelDisplayClient::Draw() {
   gfx::Size frame_size =
-      pending_frame_->passes[0]->output_rect.To<gfx::Rect>().size();
+      pending_frame_->delegated_frame_data->render_pass_list.back()->
+          output_rect.size();
   last_submitted_frame_size_ = frame_size;
   display_->Resize(frame_size);
   factory_.SubmitFrame(cc_id_,
-                       pending_frame_.To<scoped_ptr<cc::CompositorFrame>>(),
+                       pending_frame_.Pass(),
                        base::Bind(&CallCallback, pending_callback_));
-  pending_frame_.reset();
   surfaces_state_->scheduler()->SetNeedsDraw();
   pending_callback_.Reset();
 }
 
 void TopLevelDisplayClient::CommitVSyncParameters(base::TimeTicks timebase,
                                                   base::TimeDelta interval) {
 }
 
 void TopLevelDisplayClient::OutputSurfaceLost() {
   if (!display_)  // Shutdown case
@@ skipping 19 matching lines @@
       base::TimeTicks::FromInternalValue(timebase),
       base::TimeDelta::FromInternalValue(interval));
 }
 
 void TopLevelDisplayClient::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   // TODO(fsamuel): Implement this.
 }
 
 }  // namespace surfaces