Split surface id and simplify connecting to surfaces service

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 31 matching lines @@
 
 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) {
-  surfaces_service_connection->ConnectToService(&surfaces_service_);
-  surfaces_service_->CreateSurfaceConnection(base::Bind(
-      &ChildGLImpl::SurfaceConnectionCreated, weak_factory_.GetWeakPtr()));
+  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_));
 }
 
 void ChildGLImpl::ProduceFrame(
     ColorPtr color,
     SizePtr size,
     const mojo::Callback<void(SurfaceIdPtr id)>& 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_));
-  produce_callback_ = callback;
-  AllocateSurface();
+  id_ = allocator_->GenerateId();
+  surface_->CreateSurface(mojo::SurfaceId::From(id_));
+  callback.Run(SurfaceId::From(id_));
+  Draw();
 }
 
-void ChildGLImpl::SurfaceConnectionCreated(SurfacePtr surface,
-                                           uint32_t id_namespace) {
-  surface_ = surface.Pass();
-  surface_.set_client(this);
+void ChildGLImpl::SetIdNamespace(uint32_t id_namespace) {
   allocator_.reset(new cc::SurfaceIdAllocator(id_namespace));
-  AllocateSurface();
 }
 
 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);
   }
 }
 
-void ChildGLImpl::AllocateSurface() {
-  if (produce_callback_.is_null() || !allocator_)
-    return;
-
-  id_ = allocator_->GenerateId();
-  surface_->CreateSurface(mojo::SurfaceId::From(id_), mojo::Size::From(size_));
-  produce_callback_.Run(SurfaceId::From(id_));
-  Draw();
-}
-
 void ChildGLImpl::Draw() {
   // First, generate a GL texture and draw the cube into it.
   GLuint texture = 0u;
   glGenTextures(1, &texture);
   glBindTexture(GL_TEXTURE_2D, texture);
   glTexImage2D(GL_TEXTURE_2D,
                0,
                GL_RGBA,
                size_.width(),
                size_.height(),
@@ skipping 67 matching lines @@
                         mojo::Closure());
 
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ChildGLImpl::Draw, base::Unretained(this)),
       base::TimeDelta::FromMilliseconds(50));
 }
 
 }  // namespace examples
 }  // namespace mojo