De-Client Surface interface

examples/bitmap_uploader/bitmap_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/bitmap_uploader/bitmap_uploader.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif  // GL_GLEXT_PROTOTYPES
 
@@ skipping 21 matching lines @@
 }
 
 BitmapUploader::BitmapUploader(View* view)
     : view_(view),
       color_(TRANSPARENT_COLOR),
       width_(0),
       height_(0),
       format_(BGRA),
       next_resource_id_(1u),
       id_namespace_(0u),
-      local_id_(0u) {
+      local_id_(0u),
+      returner_binding_(this) {
 }
 
 void BitmapUploader::Init(Shell* shell) {
   ServiceProviderPtr surfaces_service_provider;
   shell->ConnectToApplication("mojo:surfaces_service",
                               GetProxy(&surfaces_service_provider), nullptr);
   ConnectToService(surfaces_service_provider.get(), &surface_);
-  surface_.set_client(this);
+  surface_->GetIdNamespace(
+      base::Bind(&BitmapUploader::SetIdNamespace, base::Unretained(this)));
+  mojo::ResourceReturnerPtr returner_ptr;
+  returner_binding_.Bind(GetProxy(&returner_ptr));
+  surface_->SetResourceReturner(returner_ptr.Pass());
 
   ServiceProviderPtr gpu_service_provider;
   shell->ConnectToApplication("mojo:native_viewport_service",
                               GetProxy(&gpu_service_provider), nullptr);
   ConnectToService(gpu_service_provider.get(), &gpu_service_);
 
   CommandBufferPtr gles2_client;
   gpu_service_->CreateOffscreenGLES2Context(GetProxy(&gles2_client));
   gles2_context_ =
       MojoGLES2CreateContext(gles2_client.PassMessagePipe().release().value(),
@@ skipping 165 matching lines @@
   surface_->SubmitFrame(local_id_, frame.Pass(), mojo::Closure());
 }
 
 void BitmapUploader::SetIdNamespace(uint32_t id_namespace) {
   id_namespace_ = id_namespace;
   if (color_ != TRANSPARENT_COLOR || bitmap_.get())
     Upload();
 }
 
 void BitmapUploader::ReturnResources(Array<ReturnedResourcePtr> resources) {
-  if (!resources.size())
-    return;
   MojoGLES2MakeCurrent(gles2_context_);
   // TODO(jamesr): Recycle.
   for (size_t i = 0; i < resources.size(); ++i) {
     ReturnedResourcePtr resource = resources[i].Pass();
     DCHECK_EQ(1, resource->count);
     glWaitSyncPointCHROMIUM(resource->sync_point);
     uint32_t texture_id = resource_to_texture_id_map_[resource->id];
     DCHECK_NE(0u, texture_id);
     resource_to_texture_id_map_.erase(resource->id);
     glDeleteTextures(1, &texture_id);
@@ skipping 16 matching lines @@
                0);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   return texture;
 }
 
 uint32_t BitmapUploader::TextureFormat() {
   return format_ == BGRA ? GL_BGRA_EXT : GL_RGBA;
 }
 
 }  // namespace mojo