Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/view_manager_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 "components/view_manager/view_manager_app.h"
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "components/view_manager/client_connection.h"
 #include "components/view_manager/connection_manager.h"
 #include "components/view_manager/gles2/gpu_impl.h"
 #include "components/view_manager/public/cpp/args.h"
-#include "components/view_manager/surfaces/surfaces_impl.h"
 #include "components/view_manager/surfaces/surfaces_scheduler.h"
 #include "components/view_manager/view_tree_host_connection.h"
 #include "components/view_manager/view_tree_host_impl.h"
 #include "components/view_manager/view_tree_impl.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/common/tracing_impl.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 #include "ui/events/event_switches.h"
@@ skipping 10 matching lines @@
 namespace view_manager {
 
 ViewManagerApp::ViewManagerApp()
     : app_impl_(nullptr),
       is_headless_(false) {
 }
 
 ViewManagerApp::~ViewManagerApp() {
   if (gpu_state_)
     gpu_state_->StopControlThread();
-
-  auto surfaces = surfaces_;
-  for (auto& surface : surfaces)
-    surface->CloseConnection();
 }
 
 void ViewManagerApp::Initialize(ApplicationImpl* app) {
   app_impl_ = app;
   tracing_.Initialize(app);
   surfaces_state_ = new surfaces::SurfacesState;
 
 #if !defined(OS_ANDROID)
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   is_headless_ = command_line->HasSwitch(mojo::kUseHeadlessConfig);
   if (!is_headless_) {
     event_source_ = ui::PlatformEventSource::CreateDefault();
     if (command_line->HasSwitch(mojo::kUseTestConfig))
       gfx::GLSurfaceTestSupport::InitializeOneOff();
     else
       gfx::GLSurface::InitializeOneOff();
   }
 #endif
 
   if (!gpu_state_.get())
     gpu_state_ = new gles2::GpuState;
-  connection_manager_.reset(new ConnectionManager(this));
+  connection_manager_.reset(new ConnectionManager(this, surfaces_state_));
 }
 
 bool ViewManagerApp::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
   // ViewManager
   connection->AddService<ViewTreeHostFactory>(this);
-  // Surfaces
-  // TODO(fsamuel): This should go away soon.
-  connection->AddService<mojo::Surface>(this);
   // GPU
   connection->AddService<Gpu>(this);
   return true;
 }
 
 void ViewManagerApp::OnNoMoreRootConnections() {
   app_impl_->Quit();
 }
 
 ClientConnection* ViewManagerApp::CreateClientConnectionForEmbedAtView(
@@ skipping 30 matching lines @@
 }
 
 void ViewManagerApp::Create(
     mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<Gpu> request) {
   if (!gpu_state_.get())
     gpu_state_ = new gles2::GpuState;
   new gles2::GpuImpl(request.Pass(), gpu_state_);
 }
 
-void ViewManagerApp::Create(
-    mojo::ApplicationConnection* connection,
-    mojo::InterfaceRequest<mojo::Surface> request) {
-  surfaces_.insert(
-      new surfaces::SurfacesImpl(this, surfaces_state_, request.Pass()));
-}
-
-void ViewManagerApp::OnSurfaceConnectionClosed(
-    surfaces::SurfacesImpl* surface) {
-  surfaces_.erase(surface);
-}
-
 void ViewManagerApp::CreateViewTreeHost(
     mojo::InterfaceRequest<mojo::ViewTreeHost> host,
     mojo::ViewTreeHostClientPtr host_client,
     mojo::ViewTreeClientPtr tree_client) {
   DCHECK(connection_manager_.get());
 
   // TODO(fsamuel): We need to make sure that only the window manager can create
   // new roots.
   ViewTreeHostImpl* host_impl = new ViewTreeHostImpl(
       host_client.Pass(), connection_manager_.get(), is_headless_, app_impl_,
       gpu_state_, surfaces_state_);
 
   // ViewTreeHostConnection manages its own lifetime.
   host_impl->Init(new ViewTreeHostConnectionImpl(
       host.Pass(), make_scoped_ptr(host_impl), tree_client.Pass(),
       connection_manager_.get()));
 }
 
 }  // namespace view_manager