Use local ids for Surfaces APIs that can only apply to local surfaces

services/native_viewport/viewport_surface.h

Index: services/native_viewport/viewport_surface.h
diff --git a/services/native_viewport/viewport_surface.h b/services/native_viewport/viewport_surface.h
index 329cae51084502f4aee302b9d50156ae057829ff..3739f4916b0acfae0a9e3d35126d17fea8e17948 100644
--- a/services/native_viewport/viewport_surface.h
+++ b/services/native_viewport/viewport_surface.h
@@ -14,16 +14,12 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 
-namespace cc {
-class SurfaceIdAllocator;
-}
-
 namespace native_viewport {
 
 // This manages the surface that draws to a particular NativeViewport instance.
 class ViewportSurface : public mojo::SurfaceClient {
  public:
-  ViewportSurface(mojo::SurfacesService* surfaces_service,
+  ViewportSurface(mojo::SurfacePtr surface,
                   mojo::Gpu* gpu_service,
                   const gfx::Size& size,
                   cc::SurfaceId child_id);
@@ -34,8 +30,6 @@ class ViewportSurface : public mojo::SurfaceClient {
   void SetChildId(cc::SurfaceId child_id);
 
  private:
-  void OnSurfaceConnectionCreated(mojo::SurfacePtr surface,
-                                  uint32_t id_namespace);
   void BindSurfaceToNativeViewport();
   void SubmitFrame();
 
@@ -48,8 +42,7 @@ class ViewportSurface : public mojo::SurfaceClient {
   mojo::Gpu* gpu_service_;
   uint64_t widget_id_;
   gfx::Size size_;
-  scoped_ptr<cc::SurfaceIdAllocator> id_allocator_;
-  cc::SurfaceId id_;
+  bool gles2_bound_surface_created_;

[sky, 2015/01/13 18:14:27]

Initialize this.

[jamesr, 2015/01/14 01:50:29]

Done.

   cc::SurfaceId child_id_;
   base::WeakPtrFactory<ViewportSurface> weak_factory_;