Split surface id and simplify connecting to surfaces service

examples/bitmap_uploader/bitmap_uploader.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 "examples/bitmap_uploader/bitmap_uploader.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif  // GL_GLEXT_PROTOTYPES
 
@@ skipping 85 matching lines @@
     view_->SetSurfaceId(SurfaceId::New());
     return;
   }
   if (!surface_)  // Can't upload yet, store for later.
     return;
   if (!surface_id_ || size != surface_size_) {
     if (surface_id_) {
       surface_->DestroySurface(surface_id_.Clone());
     } else {
       surface_id_ = SurfaceId::New();
-      surface_id_->id = static_cast<uint64_t>(id_namespace_) << 32;
+      surface_id_->id_namespace = id_namespace_;
     }
-    surface_id_->id++;
-    surface_->CreateSurface(surface_id_.Clone(), size.Clone());
+    surface_id_->local++;
+    surface_->CreateSurface(surface_id_.Clone());
     view_->SetSurfaceId(surface_id_.Clone());
     surface_size_ = size;
   }
 
   Rect bounds;
   bounds.width = size.width;
   bounds.height = size.height;
   PassPtr pass = CreateDefaultPass(1, bounds);
   FramePtr frame = Frame::New();
   frame->resources.resize(0u);
@@ skipping 98 matching lines @@
 
     quad->solid_color_quad_state = color_state.Pass();
     pass->quads.push_back(quad.Pass());
   }
 
   frame->passes.push_back(pass.Pass());
 
   surface_->SubmitFrame(surface_id_.Clone(), frame.Pass(), mojo::Closure());
 }
 
+void BitmapUploader::SetIdNamespace(uint32_t id_namespace) {
+}
+
 void BitmapUploader::ReturnResources(Array<ReturnedResourcePtr> resources) {
   if (!resources.size())
     return;
   MojoGLES2MakeCurrent(gles2_context_);
   // TODO(jamesr): Recycle.
   for (size_t i = 0; i < resources.size(); ++i) {
     ReturnedResourcePtr resource = resources[i].Pass();
     DCHECK_EQ(1, resource->count);
     glWaitSyncPointCHROMIUM(resource->sync_point);
     uint32_t texture_id = resource_to_texture_id_map_[resource->id];
@@ skipping 28 matching lines @@
                0);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   return texture;
 }
 
 uint32_t BitmapUploader::TextureFormat() {
   return format_ == BGRA ? GL_BGRA_EXT : GL_RGBA;
 }
 
 }  // namespace mojo