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

services/view_manager/display_manager.h

 // 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.
 
 #ifndef SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 #define SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 49 matching lines @@
   ~DefaultDisplayManager() override;
 
   // DisplayManager:
   void Init(ConnectionManager* connection_manager) override;
   void SchedulePaint(const ServerView* view, const gfx::Rect& bounds) override;
   void SetViewportSize(const gfx::Size& size) override;
   const mojo::ViewportMetrics& GetViewportMetrics() override;
 
  private:
   void OnCreatedNativeViewport(uint64_t native_viewport_id);
-  void OnSurfaceConnectionCreated(mojo::SurfacePtr surface,
-                                  uint32_t id_namespace);
   void Draw();
 
   // NativeViewportClient:
   void OnDestroyed() override;
   void OnMetricsChanged(mojo::ViewportMetricsPtr metrics) override;
 
   // SurfaceClient:
   void SetIdNamespace(uint32_t id_namespace) override;
   void ReturnResources(
       mojo::Array<mojo::ReturnedResourcePtr> resources) override;
 
   mojo::ApplicationConnection* app_connection_;
   ConnectionManager* connection_manager_;
 
   mojo::ViewportMetrics metrics_;
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
 
-  mojo::SurfacesServicePtr surfaces_service_;
   mojo::SurfacePtr surface_;
-  scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
-  cc::SurfaceId surface_id_;
+  uint32_t id_namespace_;
+  uint32_t local_id_;

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

Since local_id_ is only has two values, it seems like a boolean would be better.
Maybe did_create_surface_?

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

Hmm, yeah that'd be better.  Added surface_allocated_ since it can transition
multiple times from true->false->true over time

   mojo::NativeViewportPtr native_viewport_;
   mojo::Callback<void()> native_viewport_closed_callback_;
   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
 };
 
 }  // namespace view_manager
 
 #endif  // SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_