Handle modified displays in mustash.

services/ui/ws/display.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 "services/ui/ws/display.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 81 matching lines @@
   display_ptr->is_primary = platform_display_->IsPrimaryDisplay();
 
   // TODO(sky): make this real.
   display_ptr->frame_decoration_values = mojom::FrameDecorationValues::New();
   return display_ptr;
 }
 
 display::Display Display::ToDisplay() const {
   display::Display display(GetId());
 
-  display.set_bounds(platform_display_->GetBounds());
-  // TODO(sky): window manager needs an API to set the work area.
-  display.set_work_area(display.bounds());
-  display.set_device_scale_factor(platform_display_->GetDeviceScaleFactor());
-  display.set_rotation(platform_display_->GetRotation());
+  const display::ViewportMetrics& metrics =
+      platform_display_->GetViewportMetrics();
+
+  display.set_bounds(metrics.bounds);
+  display.set_work_area(metrics.work_area);
+  display.set_device_scale_factor(metrics.device_scale_factor);
+  display.set_rotation(metrics.rotation);
   display.set_touch_support(
       display::Display::TouchSupport::TOUCH_SUPPORT_UNKNOWN);
 
   return display;
 }
 
 void Display::SchedulePaint(const ServerWindow* window,
                             const gfx::Rect& bounds) {
   DCHECK(root_->Contains(window));
   platform_display_->SchedulePaint(window, bounds);
 }
 
-display::Display::Rotation Display::GetRotation() const {
-  return platform_display_->GetRotation();
-}
-
 gfx::Size Display::GetSize() const {
   return platform_display_->GetBounds().size();
 }
 
 ServerWindow* Display::GetRootWithId(const WindowId& id) {
   if (id == root_->id())
     return root_.get();
   for (auto& pair : window_manager_display_root_map_) {
     if (pair.second->root()->id() == id)
       return pair.second->root();
@@ skipping 169 matching lines @@
           window_server_->user_id_tracker()->active_id())
       ->OnUserActivity();
 }
 
 void Display::OnNativeCaptureLost() {
   WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
   if (display_root)
     display_root->window_manager_state()->SetCapture(nullptr, kInvalidClientId);
 }
 
-void Display::OnViewportMetricsChanged(const ViewportMetrics& old_metrics,
-                                       const ViewportMetrics& new_metrics) {
-  if (!root_)
+void Display::OnViewportMetricsChanged(
+    const display::ViewportMetrics& new_metrics) {
+  if (!root_ || root_->bounds().size() == new_metrics.bounds.size())
     return;
 
   gfx::Rect new_bounds(new_metrics.bounds.size());
   root_->SetBounds(new_bounds);
   for (auto& pair : window_manager_display_root_map_)
     pair.second->root()->SetBounds(new_bounds);
-
-  display_manager()->OnDisplayUpdate(this);
 }
 
 bool Display::CanHaveActiveChildren(ServerWindow* window) const {
   return window && activation_parents_.Contains(window);
 }
 
 void Display::OnActivationChanged(ServerWindow* old_active_window,
                                   ServerWindow* new_active_window) {
   // Don't do anything here. We assume the window manager handles restacking. If
   // we did attempt to restack than we would have to ensure clients see the
@@ skipping 67 matching lines @@
 }
 
 void Display::OnWindowManagerWindowTreeFactoryReady(
     WindowManagerWindowTreeFactory* factory) {
   if (!binding_)
     CreateWindowManagerDisplayRootFromFactory(factory);
 }
 
 }  // namespace ws
 }  // namespace ui