De-Client Surface interface

services/surfaces/surfaces_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 "services/surfaces/surfaces_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/surfaces/display.h"
@@ skipping 12 matching lines @@
   callback.Run();
 }
 }
 
 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager,
                            uint32_t id_namespace,
                            Client* client,
                            mojo::InterfaceRequest<mojo::Surface> request)
     : SurfacesImpl(manager, id_namespace, client) {
   binding_.Bind(request.Pass());
-  binding_.client()->SetIdNamespace(id_namespace);
 }
 
 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager,
                            uint32_t id_namespace,
                            Client* client,
                            mojo::SurfacePtr* surface)
     : SurfacesImpl(manager, id_namespace, client) {
   binding_.Bind(surface);
-  binding_.client()->SetIdNamespace(id_namespace);
 }
 
 SurfacesImpl::~SurfacesImpl() {
   client_->OnDisplayBeingDestroyed(display_.get());
   factory_.DestroyAll();
 }
 
+void SurfacesImpl::GetIdNamespace(
+    const Surface::GetIdNamespaceCallback& callback) {
+  callback.Run(id_namespace_);
+}
+
+void SurfacesImpl::SetResourceReturner(mojo::ResourceReturnerPtr returner) {
+  returner_ = returner.Pass();
+}
+
 void SurfacesImpl::CreateSurface(uint32_t local_id) {
   factory_.Create(QualifyIdentifier(local_id));
 }
 
 void SurfacesImpl::SubmitFrame(uint32_t local_id,
                                mojo::FramePtr frame,
                                const mojo::Closure& callback) {
   TRACE_EVENT0("mojo", "SurfacesImpl::SubmitFrame");
   factory_.SubmitFrame(QualifyIdentifier(local_id),
                        frame.To<scoped_ptr<cc::CompositorFrame>>(),
@@ skipping 20 matching lines @@
         new mojo::ContextProviderMojo(command_buffer_handle_.Pass()))));
   }
   cc::SurfaceId cc_id = QualifyIdentifier(local_id);
   factory_.Create(cc_id);
   display_->SetSurfaceId(cc_id, 1.f);
   display_->Resize(size.To<gfx::Size>());
   parameter_listeners_.AddBinding(this, listener_request.Pass());
 }
 
 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) {
-  if (resources.empty())
+  if (resources.empty() || !returner_)
     return;
   mojo::Array<mojo::ReturnedResourcePtr> ret(resources.size());
   for (size_t i = 0; i < resources.size(); ++i) {
     ret[i] = mojo::ReturnedResource::From(resources[i]);
   }
-  binding_.client()->ReturnResources(ret.Pass());
+  returner_->ReturnResources(ret.Pass());
 }
 
 void SurfacesImpl::DisplayDamaged() {
 }
 
 void SurfacesImpl::DidSwapBuffers() {
 }
 
 void SurfacesImpl::DidSwapBuffersComplete() {
 }
@@ skipping 23 matching lines @@
       id_namespace_(id_namespace),
       client_(client),
       binding_(this) {
 }
 
 cc::SurfaceId SurfacesImpl::QualifyIdentifier(uint32_t local_id) {
   return cc::SurfaceId(static_cast<uint64_t>(id_namespace_) << 32 | local_id);
 }
 
 }  // namespace mojo