Use the current primary display to update output/configure.

components/exo/wayland/server.cc

 // 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.
 
 #include "components/exo/wayland/server.h"
 
 #include <grp.h>
 #include <linux/input.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 1019 matching lines @@
       return WL_OUTPUT_TRANSFORM_90;
     case display::Display::ROTATE_180:
       return WL_OUTPUT_TRANSFORM_180;
     case display::Display::ROTATE_270:
       return WL_OUTPUT_TRANSFORM_270;
   }
   NOTREACHED();
   return WL_OUTPUT_TRANSFORM_NORMAL;
 }
 
-class WaylandDisplayObserver : public display::DisplayObserver {
+class WaylandPrimaryDisplayObserver : public display::DisplayObserver {
  public:
-  WaylandDisplayObserver(const display::Display& display,
-                         wl_resource* output_resource)
-      : display_id_(display.id()), output_resource_(output_resource) {
+  WaylandPrimaryDisplayObserver(wl_resource* output_resource)
+      : output_resource_(output_resource) {
     display::Screen::GetScreen()->AddObserver(this);
-    SendDisplayMetrics(display);
+    SendDisplayMetrics();
   }
-  ~WaylandDisplayObserver() override {
+  ~WaylandPrimaryDisplayObserver() override {
     display::Screen::GetScreen()->RemoveObserver(this);
   }
 
   // Overridden from display::DisplayObserver:
   void OnDisplayAdded(const display::Display& new_display) override {}
   void OnDisplayRemoved(const display::Display& new_display) override {}
   void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t changed_metrics) override {
-    if (display.id() != display_id_)
+    if (display::Screen::GetScreen()->GetPrimaryDisplay().id() != display.id())
       return;
 
+    // There is no need to check DISPLAY_METRIC_PRIMARY because when primary
+    // changes, bounds always changes. (new primary should have had non
+    // 0,0 origin).
+    // Only exception is when switching to newly connected primary with
+    // the same bounds. This happens whenyou're in docked mode, suspend,
+    // unplug the dislpay, then resume to the internal display which has
+    // the same resolution. Since metrics does not change, there is no need
+    // to notify clients.
     if (changed_metrics &
         (DISPLAY_METRIC_BOUNDS | DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
          DISPLAY_METRIC_ROTATION)) {
-      SendDisplayMetrics(display);
+      SendDisplayMetrics();
     }
   }
 
  private:
-  void SendDisplayMetrics(const display::Display& display) {
+  void SendDisplayMetrics() {
+    display::Display display =
+        display::Screen::GetScreen()->GetPrimaryDisplay();
+
     const ash::DisplayInfo& info =
         ash::Shell::GetInstance()->display_manager()->GetDisplayInfo(
             display.id());
 
     const float kInchInMm = 25.4f;
     const char* kUnknownMake = "unknown";
     const char* kUnknownModel = "unknown";
 
     gfx::Rect bounds = info.bounds_in_native();
     wl_output_send_geometry(
@@ skipping 12 matching lines @@
     wl_output_send_mode(
         output_resource_, WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED,
         bounds.width(), bounds.height(), static_cast<int>(60000));
 
     if (wl_resource_get_version(output_resource_) >=
         WL_OUTPUT_DONE_SINCE_VERSION) {
       wl_output_send_done(output_resource_);
     }
   }
 
-  // The identifier associated with the observed display.
-  const int64_t display_id_;
-
   // The output resource associated with the display.
   wl_resource* const output_resource_;
 
-  DISALLOW_COPY_AND_ASSIGN(WaylandDisplayObserver);
+  DISALLOW_COPY_AND_ASSIGN(WaylandPrimaryDisplayObserver);
 };
 
 const uint32_t output_version = 2;
 
 void bind_output(wl_client* client, void* data, uint32_t version, uint32_t id) {
   wl_resource* resource = wl_resource_create(
       client, &wl_output_interface, std::min(version, output_version), id);
 
-  // TODO(reveman): Multi-display support.
-  const display::Display& display = ash::Shell::GetInstance()
-                                        ->display_manager()
-                                        ->GetPrimaryDisplayCandidate();
-
   SetImplementation(
       resource, nullptr,
-      base::WrapUnique(new WaylandDisplayObserver(display, resource)));
+      base::WrapUnique(new WaylandPrimaryDisplayObserver(resource)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // xdg_surface_interface:
 
 int XdgResizeComponent(uint32_t edges) {
   switch (edges) {
     case XDG_SURFACE_RESIZE_EDGE_TOP:
       return HTTOP;
     case XDG_SURFACE_RESIZE_EDGE_BOTTOM:
@@ skipping 426 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // remote_shell_interface:
 
 // Implements remote shell interface and monitors workspace state needed
 // for the remote shell interface.
 class WaylandRemoteShell : public ash::ShellObserver,
                            public aura::client::ActivationChangeObserver,
                            public display::DisplayObserver {
  public:
   WaylandRemoteShell(Display* display,
-                     int64_t display_id,
                      wl_resource* remote_shell_resource)
       : display_(display),
-        display_id_(display_id),
         remote_shell_resource_(remote_shell_resource),
         weak_ptr_factory_(this) {
     ash::WmShell::Get()->AddShellObserver(this);
     ash::Shell* shell = ash::Shell::GetInstance();
     shell->activation_client()->AddObserver(this);
     display::Screen::GetScreen()->AddObserver(this);
     SendPrimaryDisplayMetrics();
     SendActivated(shell->activation_client()->GetActiveWindow(), nullptr);
   }
   ~WaylandRemoteShell() override {
@@ skipping 11 matching lines @@
       Surface* surface,
       const std::string& notification_id) {
     return display_->CreateNotificationSurface(surface, notification_id);
   }
 
   // Overridden from display::DisplayObserver:
   void OnDisplayAdded(const display::Display& new_display) override {}
   void OnDisplayRemoved(const display::Display& new_display) override {}
   void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t changed_metrics) override {
-    if (display.id() != display_id_)
+    if (display::Screen::GetScreen()->GetPrimaryDisplay().id() != display.id())
       return;
 
+    // No need to update when a primary dislpay has changed without bounds
+    // change. See WaylandPrimaryDisplayObserver::OnDisplayMetricsChanged
+    // for more details.
     if (changed_metrics &
         (DISPLAY_METRIC_BOUNDS | DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
          DISPLAY_METRIC_ROTATION | DISPLAY_METRIC_WORK_AREA)) {
       SendDisplayMetrics(display);
     }
     SendConfigure_DEPRECATED(display);
   }
 
   // Overridden from ash::ShellObserver:
   void OnDisplayWorkAreaInsetsChanged() override {
-    const display::Display& primary =
-        ash::Shell::GetInstance()->display_manager()->GetDisplayForId(
-            display_id_);
+    const display::Display primary =
+        display::Screen::GetScreen()->GetPrimaryDisplay();
     SendConfigure_DEPRECATED(primary);
   }
   void OnMaximizeModeStarted() override {
     layout_mode_ = ZWP_REMOTE_SHELL_V1_LAYOUT_MODE_TABLET;
     SendLayoutModeChange_DEPRECATED();
 
     send_configure_after_layout_change_ = true;
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE, base::Bind(&WaylandRemoteShell::MaybeSendConfigure,
                               weak_ptr_factory_.GetWeakPtr()),
@@ skipping 12 matching lines @@
   // Overridden from aura::client::ActivationChangeObserver:
   void OnWindowActivated(
       aura::client::ActivationChangeObserver::ActivationReason reason,
       aura::Window* gained_active,
       aura::Window* lost_active) override {
     SendActivated(gained_active, lost_active);
   }
 
  private:
   void SendPrimaryDisplayMetrics() {
-    const display::Display& primary =
-        ash::Shell::GetInstance()->display_manager()->GetDisplayForId(
-            display_id_);
+    const display::Display primary =
+        display::Screen::GetScreen()->GetPrimaryDisplay();
+
     SendConfigure_DEPRECATED(primary);
     SendDisplayMetrics(primary);
   }
 
   void MaybeSendConfigure() {
     if (send_configure_after_layout_change_)
       SendPrimaryDisplayMetrics();
   }
 
   void SendDisplayMetrics(const display::Display& display) {
@@ skipping 13 matching lines @@
 
     wl_client_flush(wl_resource_get_client(remote_shell_resource_));
   }
 
   void SendConfigure_DEPRECATED(const display::Display& display) {
     send_configure_after_layout_change_ = false;
 
     if (wl_resource_get_version(remote_shell_resource_) >= 9)
       return;
 
-    gfx::Insets work_area_insets = display.GetWorkAreaInsets();
+    const gfx::Insets& work_area_insets = display.GetWorkAreaInsets();
     zwp_remote_shell_v1_send_configure(
         remote_shell_resource_, display.size().width(), display.size().height(),
         work_area_insets.left(), work_area_insets.top(),
         work_area_insets.right(), work_area_insets.bottom());
     wl_client_flush(wl_resource_get_client(remote_shell_resource_));
   }
 
   void SendLayoutModeChange_DEPRECATED() {
     if (wl_resource_get_version(remote_shell_resource_) < 8)
       return;
@@ skipping 31 matching lines @@
 
     zwp_remote_shell_v1_send_activated(remote_shell_resource_,
                                        gained_active_surface_resource,
                                        lost_active_surface_resource);
     wl_client_flush(client);
   }
 
   // The exo display instance. Not owned.
   Display* const display_;
 
-  // The identifier associated with the observed display.
-  const int64_t display_id_;
-
   // The remote shell resource associated with observer.
   wl_resource* const remote_shell_resource_;
 
   bool send_configure_after_layout_change_ = false;
 
   int layout_mode_ = ZWP_REMOTE_SHELL_V1_LAYOUT_MODE_WINDOWED;
 
   base::WeakPtrFactory<WaylandRemoteShell> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WaylandRemoteShell);
@@ skipping 142 matching lines @@
 const uint32_t remote_shell_version = 9;
 
 void bind_remote_shell(wl_client* client,
                        void* data,
                        uint32_t version,
                        uint32_t id) {
   wl_resource* resource =
       wl_resource_create(client, &zwp_remote_shell_v1_interface,
                          std::min(version, remote_shell_version), id);
 
-  // TODO(reveman): Multi-display support.
-  const display::Display& display = ash::Shell::GetInstance()
-                                        ->display_manager()
-                                        ->GetPrimaryDisplayCandidate();
-
   SetImplementation(resource, &remote_shell_implementation,
                     base::WrapUnique(new WaylandRemoteShell(
-                        static_cast<Display*>(data), display.id(), resource)));
+                        static_cast<Display*>(data), resource)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // zwp_vsync_timing_v1_interface:
 
 // Implements VSync timing interface by monitoring a compositor for updates
 // to VSync parameters.
 class VSyncTiming : public ui::CompositorVSyncManager::Observer {
  public:
   ~VSyncTiming() { vsync_manager_->RemoveObserver(this); }
@@ skipping 1127 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo