Surfaces should acknowledge frame submissions

mojo/services/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 "mojo/services/surfaces/surfaces_impl.h"
 
+#include "base/debug/trace_event.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "mojo/cc/context_provider_mojo.h"
 #include "mojo/cc/direct_output_surface.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 
 namespace mojo {
+namespace {
+void CallCallback(const mojo::Closure& callback) {
+  callback.Run();
+}
+}
 
 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager,
                            uint32_t id_namespace,
                            Client* client,
                            SurfacePtr* surface)
     : manager_(manager),
       factory_(manager, this),
       id_namespace_(id_namespace),
       client_(client),
       binding_(this, surface) {
 }
 
 SurfacesImpl::~SurfacesImpl() {
   client_->OnDisplayBeingDestroyed(display_.get());
   factory_.DestroyAll();
 }
 
 void SurfacesImpl::CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) {
   cc::SurfaceId cc_id = id.To<cc::SurfaceId>();
   if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) {
     // Bad message, do something bad to the caller?
     NOTREACHED();
     return;
   }
   factory_.Create(id.To<cc::SurfaceId>(), size.To<gfx::Size>());
 }
 
-void SurfacesImpl::SubmitFrame(SurfaceIdPtr id, FramePtr frame_ptr) {
+void SurfacesImpl::SubmitFrame(SurfaceIdPtr id,
+                               FramePtr frame_ptr,
+                               const mojo::Closure& callback) {
+  TRACE_EVENT0("mojo", "SurfacesImpl::SubmitFrame");
   cc::SurfaceId cc_id = id.To<cc::SurfaceId>();
   if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) {
     // Bad message, do something bad to the caller?
     LOG(FATAL) << "Received frame for id " << cc_id.id << " namespace "
                << cc::SurfaceIdAllocator::NamespaceForId(cc_id)
                << " should be namespace " << id_namespace_;
     return;
   }
   factory_.SubmitFrame(id.To<cc::SurfaceId>(),
-                       frame_ptr.To<scoped_ptr<cc::CompositorFrame> >(),
-                       base::Closure());
+                       frame_ptr.To<scoped_ptr<cc::CompositorFrame>>(),
+                       base::Bind(&CallCallback, callback));
   client_->FrameSubmitted();
 }
 
 void SurfacesImpl::DestroySurface(SurfaceIdPtr id) {
   cc::SurfaceId cc_id = id.To<cc::SurfaceId>();
   if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) {
     // Bad message, do something bad to the caller?
     NOTREACHED();
     return;
   }
@@ skipping 45 matching lines @@
                                          base::TimeDelta interval) {
 }
 
 void SurfacesImpl::OutputSurfaceLost() {
 }
 
 void SurfacesImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) {
 }
 
 }  // namespace mojo