Handle modified displays in mustash.

services/ui/ws/display_manager.cc

 // Copyright 2016 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_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "services/ui/display/platform_screen.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_binding.h"
 #include "services/ui/ws/event_dispatcher.h"
 #include "services/ui/ws/platform_display_init_params.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/user_display_manager.h"
 #include "services/ui/ws/user_display_manager_delegate.h"
 #include "services/ui/ws/user_id_tracker.h"
 #include "services/ui/ws/window_manager_state.h"
+#include "services/ui/ws/window_manager_window_tree_factory.h"
 #include "services/ui/ws/window_server_delegate.h"
+#include "services/ui/ws/window_tree.h"
 
 namespace ui {
 namespace ws {
 
 DisplayManager::DisplayManager(WindowServer* window_server,
                                UserIdTracker* user_id_tracker)
     // |next_root_id_| is used as the lower bits, so that starting at 0 is
     // fine. |next_display_id_| is used by itself, so we start at 1 to reserve
     // 0 as invalid.
     : window_server_(window_server),
@@ skipping 131 matching lines @@
     previous_window_manager_state->Deactivate();
   }
 
   WindowManagerState* current_window_manager_state =
       window_server_->GetWindowManagerStateForUser(active_id);
   if (current_window_manager_state)
     current_window_manager_state->Activate(mouse_location_on_screen);
 }
 
 void DisplayManager::OnDisplayAdded(int64_t id,
-                                    const gfx::Rect& bounds,
-                                    const gfx::Size& pixel_size,
-                                    float scale_factor) {
+                                    const display::ViewportMetrics& metrics) {
   TRACE_EVENT1("mus-ws", "OnDisplayAdded", "id", id);
   PlatformDisplayInitParams params;
   params.display_id = id;
-  params.metrics.bounds = bounds;
-  params.metrics.pixel_size = pixel_size;
-  params.metrics.device_scale_factor = scale_factor;
+  params.metrics = metrics;
   params.display_compositor = window_server_->GetDisplayCompositor();
 
   ws::Display* display = new ws::Display(window_server_, params);
   display->Init(nullptr);
 
   window_server_->delegate()->UpdateTouchTransforms();
 }
 
 void DisplayManager::OnDisplayRemoved(int64_t id) {
   TRACE_EVENT1("mus-ws", "OnDisplayRemoved", "id", id);
   Display* display = GetDisplayById(id);
   if (display)
     DestroyDisplay(display);
 }
 
-void DisplayManager::OnDisplayModified(int64_t id,
-                                       const gfx::Rect& bounds,
-                                       const gfx::Size& pixel_size,
-                                       float scale_factor) {
-  // TODO(kylechar): Implement.
-  NOTREACHED();
+void DisplayManager::OnDisplayModified(
+    int64_t id,
+    const display::ViewportMetrics& metrics) {
+  TRACE_EVENT1("mus-ws", "OnDisplayModified", "id", id);
+
+  Display* display = GetDisplayById(id);
+  DCHECK(display);
+
+  // Update the platform display and check if anything has actually changed.
+  if (!display->platform_display()->UpdateViewportMetrics(metrics))
+    return;
+
+  // Send IPCs to WM clients first with new display information.
+  std::vector<WindowManagerWindowTreeFactory*> factories =
+      window_server_->window_manager_window_tree_factory_set()->GetFactories();
+  for (WindowManagerWindowTreeFactory* factory : factories) {
+    if (factory->window_tree())
+      factory->window_tree()->OnWmDisplayModified(display->ToDisplay());
+  }
+
+  display->OnViewportMetricsChanged(metrics);
+  OnDisplayUpdate(display);
 }
 
 }  // namespace ws
 }  // namespace ui