mus: Changes SetDisplayRoot() to create actual display

services/ui/service.h

 // 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.
 
 #ifndef SERVICES_UI_SERVICE_H_
 #define SERVICES_UI_SERVICE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 65 matching lines @@
       public service_manager::InterfaceFactory<mojom::WindowTreeFactory>,
       public service_manager::InterfaceFactory<mojom::WindowTreeHostFactory>,
       public service_manager::InterfaceFactory<
           discardable_memory::mojom::DiscardableSharedMemoryManager>,
       public service_manager::InterfaceFactory<mojom::WindowServerTest> {
  public:
   Service();
   ~Service() override;
 
  private:
+  // How the ScreenManager is configured.
+  enum ScreenManagerConfig {
+    // Initial state.
+    UNKNOWN,
+
+    // ScreenManager runs locally.
+    INTERNAL,
+
+    // Used when the window manager supplies a value of false for
+    // |automatically_create_display_roots|. In this config the ScreenManager
+    // is configured to forward calls.
+    FORWARDING,
+  };
+
   // Holds InterfaceRequests received before the first WindowTreeHost Display
   // has been established.
   struct PendingRequest;
   struct UserState;
 
   using UserIdToUserState = std::map<ws::UserId, std::unique_ptr<UserState>>;
 
   void InitializeResources(service_manager::Connector* connector);
 
   // Returns the user specific state for the user id of |remote_identity|.
   // Service owns the return value.
   // TODO(sky): if we allow removal of user ids then we need to close anything
   // associated with the user (all incoming pipes...) on removal.
   UserState* GetUserState(const service_manager::Identity& remote_identity);
 
   void AddUserIfNecessary(const service_manager::Identity& remote_identity);
 
   // service_manager::Service:
   void OnStart() override;
   void OnBindInterface(const service_manager::ServiceInfo& source_info,
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle interface_pipe) override;
 
   // WindowServerDelegate:
   void StartDisplayInit() override;
   void OnFirstDisplayReady() override;
   void OnNoMoreDisplays() override;
   bool IsTestConfig() const override;
+  void OnWillCreateTreeForWindowManager(
+      bool automatically_create_display_roots) override;
+  display::ScreenBase* GetScreen() override;
 
   // service_manager::InterfaceFactory<mojom::AccessibilityManager>
   // implementation.
   void Create(const service_manager::Identity& remote_identity,
               mojom::AccessibilityManagerRequest request) override;
 
   // service_manager::InterfaceFactory<mojom::Clipboard> implementation.
   void Create(const service_manager::Identity& remote_identity,
               mojom::ClipboardRequest request) override;
 
@@ skipping 67 matching lines @@
   std::unique_ptr<display::ScreenManager> screen_manager_;
 
   IMERegistrarImpl ime_registrar_;
   IMEServerImpl ime_server_;
 
   std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
       discardable_shared_memory_manager_;
 
   service_manager::BinderRegistry registry_;
 
+  // Set to true in StartDisplayInit().
+  bool is_gpu_ready_ = false;
+  ScreenManagerConfig screen_manager_config_ = ScreenManagerConfig::UNKNOWN;
+  std::unique_ptr<display::ScreenBase> screen_;

[kylechar, 2017/04/19 18:06:08]

ScreenManagerOzoneInternal and ScreenManagerStubInternal both create a
ScreenBase instance already. I wonder if you could move this to
ScreenManagerForwarding and then add virtual ScreenManager::GetScreen()?
ScreenManager is already a singleton, so WindowServerDelegate::GetScreen()
wouldn't be necessary.

[sky, 2017/04/19 19:30:03]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SERVICE_H_