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

examples/surfaces_app/child_gl_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 "examples/surfaces_app/child_gl_impl.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
@@ skipping 28 matching lines @@
 using cc::TextureDrawQuad;
 using cc::DelegatedFrameData;
 using cc::CompositorFrame;
 
 static void ContextLostThunk(void*) {
   LOG(FATAL) << "Context lost";
 }
 
 ChildGLImpl::ChildGLImpl(ApplicationConnection* surfaces_service_connection,
                          CommandBufferPtr command_buffer)
-    : start_time_(base::TimeTicks::Now()),
-      next_resource_id_(1),
-      weak_factory_(this) {
+    : local_id_(1u), start_time_(base::TimeTicks::Now()), next_resource_id_(1) {

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

Member initialize id_namespace_ too.

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

Done.

   surfaces_service_connection->ConnectToService(&surface_);
   surface_.set_client(this);
-  surface_.WaitForIncomingMethodCall();  // Wait for ID namespace to arrive.
   context_ =
       MojoGLES2CreateContext(command_buffer.PassMessagePipe().release().value(),
                              &ContextLostThunk,
                              this,
                              Environment::GetDefaultAsyncWaiter());
   DCHECK(context_);
   MojoGLES2MakeCurrent(context_);
 }
 
 ChildGLImpl::~ChildGLImpl() {
   MojoGLES2DestroyContext(context_);
-  surface_->DestroySurface(mojo::SurfaceId::From(id_));
+  surface_->DestroySurface(local_id_);
 }
 
-void ChildGLImpl::ProduceFrame(
-    ColorPtr color,
-    SizePtr size,
-    const mojo::Callback<void(SurfaceIdPtr id)>& callback) {
+void ChildGLImpl::ProduceFrame(ColorPtr color,
+                               SizePtr size,
+                               const ProduceCallback& callback) {
   color_ = color.To<SkColor>();
   size_ = size.To<gfx::Size>();
   cube_.Init(size_.width(), size_.height());
   cube_.set_color(
       SkColorGetR(color_), SkColorGetG(color_), SkColorGetB(color_));
-  id_ = allocator_->GenerateId();
-  surface_->CreateSurface(mojo::SurfaceId::From(id_));
-  callback.Run(SurfaceId::From(id_));
+  surface_->CreateSurface(local_id_);
+  produce_callback_ = callback;
+  if (id_namespace_ != 0u)
+    RunProduceCallback();
   Draw();
 }
 
 void ChildGLImpl::SetIdNamespace(uint32_t id_namespace) {
-  allocator_.reset(new cc::SurfaceIdAllocator(id_namespace));
+  id_namespace_ = id_namespace;
+  if (!produce_callback_.is_null())
+    RunProduceCallback();
+  produce_callback_.reset();
+}
+
+void ChildGLImpl::RunProduceCallback() {
+  auto id = SurfaceId::New();
+  id->id_namespace = id_namespace_;
+  id->local = local_id_;
+  produce_callback_.Run(id.Pass());
 }
 
 void ChildGLImpl::ReturnResources(Array<ReturnedResourcePtr> resources) {
   for (size_t i = 0; i < resources.size(); ++i) {
     cc::ReturnedResource res = resources[i].To<cc::ReturnedResource>();
     GLuint returned_texture = id_to_tex_map_[res.id];
     glDeleteTextures(1, &returned_texture);
   }
 }
 
@@ skipping 66 matching lines @@
                        flipped,
                        nearest_neighbor);
 
   scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
   delegated_frame_data->render_pass_list.push_back(pass.Pass());
   delegated_frame_data->resource_list.push_back(resource);
 
   scoped_ptr<CompositorFrame> frame(new CompositorFrame);
   frame->delegated_frame_data = delegated_frame_data.Pass();
 
-  surface_->SubmitFrame(mojo::SurfaceId::From(id_), mojo::Frame::From(*frame),
-                        mojo::Closure());
+  surface_->SubmitFrame(local_id_, mojo::Frame::From(*frame), mojo::Closure());
 
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ChildGLImpl::Draw, base::Unretained(this)),
       base::TimeDelta::FromMilliseconds(50));
 }
 
 }  // namespace examples
 }  // namespace mojo