Split surface id and simplify connecting to surfaces service

examples/ganesh_app/texture_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/ganesh_app/texture_uploader.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
@@ skipping 114 matching lines @@
 }
 
 void TextureUploader::EnsureSurfaceForSize(const mojo::Size& size) {
   if (surface_id_ && size == surface_size_)
     return;
 
   if (surface_id_) {
     surface_->DestroySurface(surface_id_.Clone());
   } else {
     surface_id_ = mojo::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());
   client_->OnSurfaceIdAvailable(surface_id_.Clone());
   surface_size_ = size;
 }
 
 void TextureUploader::OnContextLost() {
   LOG(FATAL) << "Context lost.";
 }
 
+void TextureUploader::SetIdNamespace(uint32_t id_namespace) {
+}
+
 void TextureUploader::ReturnResources(
     mojo::Array<mojo::ReturnedResourcePtr> resources) {
   if (!resources.size())
     return;
   context_->MakeCurrent();
   for (size_t i = 0u; i < resources.size(); ++i) {
     mojo::ReturnedResourcePtr resource = resources[i].Pass();
     DCHECK_EQ(1, resource->count);
     glWaitSyncPointCHROMIUM(resource->sync_point);
     mojo::GLTexture* texture = resource_to_texture_map_[resource->id];
     DCHECK_NE(0u, texture->texture_id());
     resource_to_texture_map_.erase(resource->id);
     delete texture;
   }
 }
 
 void TextureUploader::OnSurfaceConnectionCreated(mojo::SurfacePtr surface,
                                                  uint32_t id_namespace) {
   surface_ = surface.Pass();
   surface_.set_client(this);
   id_namespace_ = id_namespace;
 
   if (pending_upload_)
     Upload(pending_upload_.Pass());
 }
 
 }  // namespace examples