Update mojo surfaces bindings and mojo/cc/ glue

mojo/examples/surfaces_app/child_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 "mojo/examples/surfaces_app/child_impl.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "mojo/examples/surfaces_app/surfaces_util.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h"
 #include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
 #include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 
 namespace mojo {
 namespace examples {
 
 using cc::RenderPass;
 using cc::DrawQuad;
 using cc::SolidColorDrawQuad;
 using cc::DelegatedFrameData;
 using cc::CompositorFrame;
 
-ChildImpl::ChildImpl(ApplicationConnection* surfaces_service_connection) {
-  surfaces_service_connection->ConnectToService(&surface_);
-  surface_.set_client(this);
+ChildImpl::ChildImpl(ApplicationConnection* surfaces_service_connection)
+    : weak_factory_(this) {
+  surfaces_service_connection->ConnectToService(&surfaces_service_);
+  surfaces_service_->CreateSurfaceConnection(base::Bind(
+      &ChildImpl::SurfaceConnectionCreated, weak_factory_.GetWeakPtr()));
 }
 
 ChildImpl::~ChildImpl() {
-  surface_->DestroySurface(mojo::SurfaceId::From(id_));
+  if (surface_)
+    surface_->DestroySurface(mojo::SurfaceId::From(id_));
 }
 
 void ChildImpl::ProduceFrame(
     ColorPtr color,
     SizePtr size,
     const mojo::Callback<void(SurfaceIdPtr id)>& callback) {
   color_ = color.To<SkColor>();
   size_ = size.To<gfx::Size>();
   produce_callback_ = callback;
   if (allocator_)
     Draw();
 }
 
-void ChildImpl::SetIdNamespace(uint32_t id_namespace) {
+void ChildImpl::SurfaceConnectionCreated(SurfacePtr surface,
+                                         uint32_t id_namespace) {
+  surface_ = surface.Pass();
+  surface_.set_client(this);
   allocator_.reset(new cc::SurfaceIdAllocator(id_namespace));
   if (!produce_callback_.is_null())
     Draw();
 }
 
 void ChildImpl::ReturnResources(
     Array<ReturnedResourcePtr> resources) {
   DCHECK(!resources.size());
 }
 
@@ skipping 23 matching lines @@
   scoped_ptr<CompositorFrame> frame(new CompositorFrame);
   frame->delegated_frame_data = delegated_frame_data.Pass();
 
   surface_->SubmitFrame(mojo::SurfaceId::From(id_),
                         mojo::Frame::From(*frame));
   produce_callback_.Run(SurfaceId::From(id_));
 }
 
 }  // namespace examples
 }  // namespace mojo