Roll Chrome into 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 "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"
 
 using mojo::SurfaceIdPtr;
 
 namespace surfaces {
 
 namespace {
-void CallCallback(const mojo::Closure& callback, bool frame_drawn) {
+void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) {
   callback.Run();
 }
 }
 
 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager,
                            uint32_t id_namespace,
                            Client* client,
                            mojo::InterfaceRequest<mojo::Surface> request)
     : SurfacesImpl(manager, id_namespace, client) {
   binding_.Bind(request.Pass());
@@ skipping 97 matching lines @@
       id_namespace_(id_namespace),
       client_(client),
       binding_(this) {
 }
 
 cc::SurfaceId SurfacesImpl::QualifyIdentifier(uint32_t local_id) {
   return cc::SurfaceId(static_cast<uint64_t>(id_namespace_) << 32 | local_id);
 }
 
 }  // namespace mojo