De-Client Surface interface

examples/surfaces_app/surfaces_app.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 "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "examples/surfaces_app/child.mojom.h"
 #include "examples/surfaces_app/embedder.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
 #include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
 #include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
 #include "ui/gfx/rect.h"
 
 namespace mojo {
 namespace examples {
 
 static const uint32_t kLocalId = 1u;
 
-class SurfacesApp : public ApplicationDelegate, public SurfaceClient {
+class SurfacesApp : public ApplicationDelegate {
  public:
   SurfacesApp() : id_namespace_(0u), weak_factory_(this) {}
   ~SurfacesApp() override {}
 
   // ApplicationDelegate implementation
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->ConnectToService("mojo:native_viewport_service", &viewport_);
 
     connection->ConnectToService("mojo:surfaces_service", &surface_);
-    surface_.set_client(this);
+    surface_->GetIdNamespace(
+        base::Bind(&SurfacesApp::SetIdNamespace, base::Unretained(this)));
     embedder_.reset(new Embedder(kLocalId, surface_.get()));
 
     size_ = gfx::Size(800, 600);
 
     viewport_->Create(Size::From(size_),
                       base::Bind(&SurfacesApp::OnCreatedNativeViewport,
                                  weak_factory_.GetWeakPtr()));
     viewport_->Show();
 
     child_size_ = gfx::Size(size_.width() / 3, size_.height() / 2);
@@ skipping 27 matching lines @@
     embedder_->ProduceFrame(child_one_id_, child_two_id_, child_size_, size_,
                             bounced_offset);
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(
             &SurfacesApp::Draw, base::Unretained(this), (offset + 2) % 400),
         base::TimeDelta::FromMilliseconds(50));
   }
 
  private:
-  // SurfaceClient implementation.
-  void SetIdNamespace(uint32_t id_namespace) override {
+  void SetIdNamespace(uint32_t id_namespace) {
     auto qualified_id = mojo::SurfaceId::New();
     qualified_id->id_namespace = id_namespace;
     qualified_id->local = kLocalId;
     viewport_->SubmittedFrame(qualified_id.Pass());
   }
-  void ReturnResources(Array<ReturnedResourcePtr> resources) override {
-    DCHECK(!resources.size());
-  }
   void OnCreatedNativeViewport(uint64_t native_viewport_id,
                                mojo::ViewportMetricsPtr metrics) {}
 
   SurfacePtr surface_;
   uint32_t id_namespace_;
   SurfaceIdPtr onscreen_id_;
   scoped_ptr<Embedder> embedder_;
   ChildPtr child_one_;
   cc::SurfaceId child_one_id_;
   ChildPtr child_two_;
   cc::SurfaceId child_two_id_;
   gfx::Size size_;
   gfx::Size child_size_;
 
   NativeViewportPtr viewport_;
 
   base::WeakPtrFactory<SurfacesApp> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfacesApp);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::SurfacesApp);
   return runner.Run(shell_handle);
 }