Basic display management for mus

components/mus/ws/platform_display.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 COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_
 #define COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/ws/platform_display_delegate.h"
 #include "components/mus/ws/platform_display_init_params.h"
 #include "mojo/public/cpp/bindings/callback.h"
+#include "ui/display/types/display_snapshot.h"
+#include "ui/display/types/native_display_delegate.h"
+#include "ui/display/types/native_display_observer.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace cc {
 class CompositorFrame;
 class CopyOutputRequest;
 class SurfaceIdAllocator;
 class SurfaceManager;
 }  // namespace cc
 
@@ skipping 66 matching lines @@
   }
 
  private:
   // Static factory instance (always NULL for non-test).
   static PlatformDisplayFactory* factory_;
 };
 
 // PlatformDisplay implementation that connects to the services necessary to
 // actually display.
 class DefaultPlatformDisplay : public PlatformDisplay,
-                               public ui::PlatformWindowDelegate {
+                               public ui::PlatformWindowDelegate,
+                               public ui::NativeDisplayObserver {
  public:
   explicit DefaultPlatformDisplay(const PlatformDisplayInitParams& init_params);
   ~DefaultPlatformDisplay() override;
 
   // PlatformDisplay:
   void Init(PlatformDisplayDelegate* delegate) override;
   void SchedulePaint(const ServerWindow* window,
                      const gfx::Rect& bounds) override;
   void SetViewportSize(const gfx::Size& size) override;
   void SetTitle(const base::string16& title) override;
   void SetCapture() override;
   void ReleaseCapture() override;
   void SetCursorById(int32_t cursor) override;
   const mojom::ViewportMetrics& GetViewportMetrics() override;
   mojom::Rotation GetRotation() override;
   void UpdateTextInputState(const ui::TextInputState& state) override;
   void SetImeVisibility(bool visible) override;
   bool IsFramePending() const override;
   void RequestCopyOfOutput(
       scoped_ptr<cc::CopyOutputRequest> output_request) override;
 
+  // ui::NativeDisplayObserver:
+  void OnConfigurationChanged() override;
+
+  // Additional display management callbacks.

[sky, 2016/04/18 21:25:00]

Make these private?

[rjkroege, 2016/04/21 20:19:53]

Done.

+  void OnDisplaysAquired(const std::vector<ui::DisplaySnapshot*>& displays);
+  void OnDisplayConfigured(const gfx::Rect& bounds, bool success);
+
  private:
   void WantToDraw();
 
   // This method initiates a top level redraw of the display.
   // TODO(fsamuel): This should use vblank as a signal rather than a timer
   // http://crbug.com/533042
   void Draw();
 
   // This is called after cc::Display has completed generating a new frame
   // for the display. TODO(fsamuel): Idle time processing should happen here
@@ skipping 21 matching lines @@
   PlatformDisplayDelegate* delegate_;
 
   mojom::ViewportMetrics metrics_;
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
   bool frame_pending_;
 
   scoped_ptr<TopLevelDisplayClient> top_level_display_client_;
   scoped_ptr<ui::PlatformWindow> platform_window_;
 
+  // Flags used to keep track of the current state of display configuration.
+  // |is_configuring| is true if configuring the displays and starts false.
+  bool is_configuring_;
+  // If |is_configuring_| is true and another display configuration event
+  // happens, the event is deferred. |should_configure_| is set to true and a
+  // display configuration will be scheduled after the current one finishes.
+  // NB: events are handled once per vblank.
+  bool should_configure_;
+  scoped_ptr<ui::NativeDisplayDelegate> native_display_delegate_;
+
 #if !defined(OS_ANDROID)
   scoped_ptr<ui::CursorLoader> cursor_loader_;
 #endif
 
   base::WeakPtrFactory<DefaultPlatformDisplay> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay);
 };
 
 }  // namespace ws
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_