De-Client Surface interface

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 12 matching lines @@
 }
 
 TextureUploader::TextureUploader(Client* client,
                                  mojo::Shell* shell,
                                  base::WeakPtr<mojo::GLContext> context)
     : client_(client),
       context_(context),
       next_resource_id_(0u),
       id_namespace_(0u),
       local_id_(0u),
+      returner_binding_(this),
       weak_factory_(this) {
   context_->AddObserver(this);
 
   mojo::ServiceProviderPtr surfaces_service_provider;
   shell->ConnectToApplication("mojo:surfaces_service",
                               mojo::GetProxy(&surfaces_service_provider),
                               nullptr);
   mojo::ConnectToService(surfaces_service_provider.get(), &surface_);
-  surface_.set_client(this);
+  surface_->GetIdNamespace(
+      base::Bind(&TextureUploader::SetIdNamespace, base::Unretained(this)));
+  mojo::ResourceReturnerPtr returner_ptr;
+  returner_binding_.Bind(GetProxy(&returner_ptr));
+  surface_->SetResourceReturner(returner_ptr.Pass());
 }
 
 TextureUploader::~TextureUploader() {
   if (context_.get())
     context_->RemoveObserver(this);
 }
 
 void TextureUploader::Upload(scoped_ptr<mojo::GLTexture> texture) {
   if (!surface_) {
     pending_upload_ = texture.Pass();
@@ skipping 95 matching lines @@
 }
 
 void TextureUploader::SetIdNamespace(uint32_t id_namespace) {
   id_namespace_ = id_namespace;
   if (local_id_ != 0u)
     SendFullyQualifiedID();
 }
 
 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;
   }
 }
 
 }  // namespace examples