Start to decouple display::Display from ws::PlatformDisplay.

services/ui/ws/display.h

 // Copyright 2015 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_WS_DISPLAY_H_
 #define SERVICES_UI_WS_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 11 matching lines @@
 #include "services/ui/ws/focus_controller_observer.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/platform_display_delegate.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_observer.h"
 #include "services/ui/ws/server_window_tracker.h"
 #include "services/ui/ws/user_id_tracker_observer.h"
 #include "services/ui/ws/window_manager_window_tree_factory_set_observer.h"
 #include "ui/display/display.h"
 
+namespace display {
+struct ViewportMetrics;
+}
+
 namespace ui {
 namespace ws {
 
 class DisplayBinding;
 class DisplayManager;
 class FocusController;
-struct PlatformDisplayInitParams;
 class WindowManagerDisplayRoot;
 class WindowServer;
 class WindowTree;
 
 namespace test {
 class DisplayTestApi;
 }
 
 // Displays manages the state associated with a single display. Display has a
 // single root window whose children are the roots for a per-user
 // WindowManager. Display is configured in two distinct
 // ways:
 // . with a DisplayBinding. In this mode there is only ever one WindowManager
 //   for the display, which comes from the client that created the
 //   Display.
 // . without a DisplayBinding. In this mode a WindowManager is automatically
 //   created per user.
 class Display : public PlatformDisplayDelegate,
                 public mojom::WindowTreeHost,
                 public FocusControllerObserver,
                 public FocusControllerDelegate,
                 public UserIdTrackerObserver,
                 public WindowManagerWindowTreeFactorySetObserver {
  public:
   explicit Display(WindowServer* window_server);
   ~Display() override;
 
   // Initializes the display root ServerWindow and PlatformDisplay. Adds this to
   // DisplayManager as a pending display, until accelerated widget is available.
-  void Init(const PlatformDisplayInitParams& init_params,
+  void Init(const display::ViewportMetrics& metrics,
             std::unique_ptr<DisplayBinding> binding);
 
+  // Returns an ID for this display. In internal mode this the display::Display
+  // ID. In external mode this hasn't been defined yet.
   int64_t GetId() const;
 
+  // Sets the display::Display corresponding to this ws::Display. This is only
+  // valid in internal window mode.
+  void SetDisplay(const display::Display& display);
+
+  // PlatformDisplayDelegate:
+  display::Display GetDisplay() override;

[sky, 2017/03/13 18:29:06]

Can this return a const Display& ?

[kylechar, 2017/03/13 19:28:02]

Yep! I missed that it wasn't.

+
   DisplayManager* display_manager();
   const DisplayManager* display_manager() const;
 
   PlatformDisplay* platform_display() { return platform_display_.get(); }
 
-  // Returns a display::Display corresponding to this ws::Display.
-  display::Display ToDisplay() const;
-
   // Returns the size of the display in physical pixels.
   gfx::Size GetSize() const;
 
   WindowServer* window_server() { return window_server_; }
 
   // Returns the root of the Display. The root's children are the roots
   // of the corresponding WindowManagers.
   ServerWindow* root_window() { return root_.get(); }
   const ServerWindow* root_window() const { return root_.get(); }
 
@@ skipping 70 matching lines @@
   void CreateWindowManagerDisplayRootsFromFactories();
 
   void CreateWindowManagerDisplayRootFromFactory(
       WindowManagerWindowTreeFactory* factory);
 
   // Creates the root ServerWindow for this display, where |size| is in physical
   // pixels.
   void CreateRootWindow(const gfx::Size& size);
 
   // PlatformDisplayDelegate:
-  display::Display GetDisplay() override;
   ServerWindow* GetRootWindow() override;
   void OnAcceleratedWidgetAvailable() override;
   bool IsInHighContrastMode() override;
   void OnEvent(const ui::Event& event) override;
   void OnNativeCaptureLost() override;
 
   // FocusControllerDelegate:
   bool CanHaveActiveChildren(ServerWindow* window) const override;
 
   // FocusControllerObserver:
   void OnActivationChanged(ServerWindow* old_active_window,
                            ServerWindow* new_active_window) override;
   void OnFocusChanged(FocusControllerChangeSource change_source,
                       ServerWindow* old_focused_window,
                       ServerWindow* new_focused_window) override;
 
   // UserIdTrackerObserver:
   void OnUserIdRemoved(const UserId& id) override;
 
   // WindowManagerWindowTreeFactorySetObserver:
   void OnWindowManagerWindowTreeFactoryReady(
       WindowManagerWindowTreeFactory* factory) override;
 
   std::unique_ptr<DisplayBinding> binding_;
   WindowServer* const window_server_;
   std::unique_ptr<ServerWindow> root_;
   std::unique_ptr<PlatformDisplay> platform_display_;
   std::unique_ptr<FocusController> focus_controller_;
 
+  // In internal window mode this contains information about the display. In
+  // external window mode this will be invalid.
+  display::Display display_;
+
   // The last cursor set. Used to track whether we need to change the cursor.
   mojom::Cursor last_cursor_;
 
   ServerWindowTracker activation_parents_;
 
   cc::LocalSurfaceIdAllocator allocator_;
 
   WindowManagerDisplayRootMap window_manager_display_root_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DISPLAY_H_