Split surface id and simplify connecting to surfaces service

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) {
   callback.Run();
 }
 }
 
 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager,

[sky, 2014/12/16 03:34:04]

nit: move to match position in header.

                            uint32_t id_namespace,
+                           Client* client)
+    : manager_(manager),
+      factory_(manager, this),
+      id_namespace_(id_namespace),
+      client_(client),
+      binding_(this) {
+}
+
+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());
+  binding_.client()->SetIdNamespace(id_namespace);
+}
+
+SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager,
+                           uint32_t id_namespace,
                            Client* client,
                            mojo::SurfacePtr* surface)
-    : manager_(manager),
-      factory_(manager, this),
-      id_namespace_(id_namespace),
-      client_(client),
-      binding_(this, surface) {
+    : SurfacesImpl(manager, id_namespace, client) {
+  binding_.Bind(surface);
+  binding_.client()->SetIdNamespace(id_namespace);
 }
 
 SurfacesImpl::~SurfacesImpl() {
   client_->OnDisplayBeingDestroyed(display_.get());
   factory_.DestroyAll();
 }
 
-void SurfacesImpl::CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) {
+void SurfacesImpl::CreateSurface(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;
   }
   factory_.Create(id.To<cc::SurfaceId>());
 }
 
 void SurfacesImpl::SubmitFrame(SurfaceIdPtr id,
@@ skipping 80 matching lines @@
 }
 
 void SurfacesImpl::OnVSyncParametersUpdated(int64_t timebase,
                                             int64_t interval) {
   client_->OnVSyncParametersUpdated(
       base::TimeTicks::FromInternalValue(timebase),
       base::TimeDelta::FromInternalValue(interval));
 }
 
 }  // namespace mojo