Basic display management for mus

components/mus/mus_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/mus/mus_app.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "components/mus/common/args.h"
 #include "components/mus/gles2/gpu_impl.h"
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/display_binding.h"
 #include "components/mus/ws/display_manager.h"
+#include "components/mus/ws/platform_screen.h"
 #include "components/mus/ws/user_display_manager.h"
 #include "components/mus/ws/window_server.h"
 #include "components/mus/ws/window_server_test_impl.h"
 #include "components/mus/ws/window_tree.h"
 #include "components/mus/ws/window_tree_binding.h"
 #include "components/mus/ws/window_tree_factory.h"
 #include "components/mus/ws/window_tree_host_factory.h"
 #include "components/resource_provider/public/cpp/resource_loader.h"
 #include "mojo/public/c/system/main.h"
 #include "services/shell/public/cpp/connection.h"
@@ skipping 33 matching lines @@
 // TODO(sky): this is a pretty typical pattern, make it easier to do.
 struct MandolineUIServicesApp::PendingRequest {
   shell::Connection* connection;
   std::unique_ptr<mojo::InterfaceRequest<mojom::WindowTreeFactory>> wtf_request;
 };
 
 struct MandolineUIServicesApp::UserState {
   std::unique_ptr<ws::WindowTreeHostFactory> window_tree_host_factory;
 };
 
-MandolineUIServicesApp::MandolineUIServicesApp() : test_config_(false) {}
+MandolineUIServicesApp::MandolineUIServicesApp()
+    : test_config_(false),
+      platform_screen_(new ws::PlatformScreen()),
+      weak_ptr_factory_(this) {}
 
 MandolineUIServicesApp::~MandolineUIServicesApp() {
   // Destroy |window_server_| first, since it depends on |event_source_|.
   // WindowServer (or more correctly its Displays) may have state that needs to
   // be destroyed before GpuState as well.
   window_server_.reset();
 
   if (platform_display_init_params_.gpu_state)
     platform_display_init_params_.gpu_state->StopThreads();
 }
@@ skipping 79 matching lines @@
 // TODO(rjkroege): Enter sandbox here before we start threads in GpuState
 // http://crbug.com/584532
 
 #if !defined(OS_ANDROID)
   event_source_ = ui::PlatformEventSource::CreateDefault();
 #endif
 
   // TODO(rjkroege): It is possible that we might want to generalize the
   // GpuState object.
   platform_display_init_params_.gpu_state = new GpuState();
+
+  // Gpu must be running before the PlatformScreen can be initialized.
+  platform_screen_->Init();
   window_server_.reset(
       new ws::WindowServer(this, platform_display_init_params_.surfaces_state));
 }
 
 bool MandolineUIServicesApp::AcceptConnection(Connection* connection) {
   connection->AddInterface<Gpu>(this);
   connection->AddInterface<mojom::DisplayManager>(this);
   connection->AddInterface<mojom::UserAccessManager>(this);
   connection->AddInterface<WindowTreeHostFactory>(this);
   connection->AddInterface<mojom::WindowManagerFactoryService>(this);
@@ skipping 13 matching lines @@
 void MandolineUIServicesApp::OnNoMoreDisplays() {
   // We may get here from the destructor, in which case there is no messageloop.
   if (base::MessageLoop::current())
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
 bool MandolineUIServicesApp::IsTestConfig() const {
   return test_config_;
 }
 
-void MandolineUIServicesApp::CreateDefaultDisplays() {
+void MandolineUIServicesApp::CreatePhysicalDisplayCallback(int64_t id,

[sky, 2016/05/03 02:39:50]

Make position match that of header.

[rjkroege, 2016/05/03 21:03:03]

Done.

+                                                           gfx::Rect bounds) {
+  platform_display_init_params_.display_bounds = bounds;
+  platform_display_init_params_.display_id = id;
+
   // Display manages its own lifetime.
   ws::Display* host_impl =
       new ws::Display(window_server_.get(), platform_display_init_params_);
   host_impl->Init(nullptr);
 }
 
+void MandolineUIServicesApp::CreateDefaultDisplays() {
+  // An asynchronous callback will create the Displays once the physical
+  // displays are ready.
+  platform_screen_->ConfigurePhysicalDisplay(
+      base::Bind(&MandolineUIServicesApp::CreatePhysicalDisplayCallback,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
 void MandolineUIServicesApp::Create(shell::Connection* connection,
                                     mojom::DisplayManagerRequest request) {
   window_server_->display_manager()
       ->GetUserDisplayManager(connection->GetRemoteIdentity().user_id())
       ->AddDisplayManagerBinding(std::move(request));
 }
 
 void MandolineUIServicesApp::Create(shell::Connection* connection,
                                     mojom::UserAccessManagerRequest request) {
   window_server_->user_id_tracker()->Bind(std::move(request));
@@ skipping 44 matching lines @@
   new ws::WindowServerTestImpl(window_server_.get(), std::move(request));
 }
 
 void MandolineUIServicesApp::Create(shell::Connection* connection,
                                     mojom::GpuRequest request) {
   DCHECK(platform_display_init_params_.gpu_state);
   new GpuImpl(std::move(request), platform_display_init_params_.gpu_state);
 }
 
 }  // namespace mus