Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/surfaces/surfaces_impl.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 "components/view_manager/surfaces/surfaces_impl.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/surfaces/surface_id_allocator.h"
@@ skipping 40 matching lines @@
 
 void SurfacesImpl::SetResourceReturner(mojo::ResourceReturnerPtr returner) {
   returner_ = returner.Pass();
 }
 
 void SurfacesImpl::CreateSurface(uint32_t local_id) {
   factory_.Create(QualifyIdentifier(local_id));
 }
 
 void SurfacesImpl::SubmitFrame(uint32_t local_id,
-                               mojo::FramePtr frame,
+                               mojo::CompositorFramePtr frame,
                                const mojo::Closure& callback) {
   TRACE_EVENT0("mojo", "SurfacesImpl::SubmitFrame");
   factory_.SubmitFrame(QualifyIdentifier(local_id),
                        frame.To<scoped_ptr<cc::CompositorFrame>>(),
                        base::Bind(&CallCallback, callback));
   state_->scheduler()->SetNeedsDraw();
 }
 
 void SurfacesImpl::DestroySurface(uint32_t local_id) {
   factory_.Destroy(QualifyIdentifier(local_id));
@@ skipping 13 matching lines @@
   // Only CloseConnection should be allowed to destroy this object.
   DCHECK(connection_closed_);
   factory_.DestroyAll();
 }
 
 cc::SurfaceId SurfacesImpl::QualifyIdentifier(uint32_t local_id) {
   return cc::SurfaceId(static_cast<uint64_t>(id_namespace_) << 32 | local_id);
 }
 
 }  // namespace mojo