BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 12 insertions, 12 deletions

diff --git a/chromium/ui/aura/window_tree_host.cc b/chromium/ui/aura/window_tree_host.cc
index 29c93adb189..b0e2720fe05 100644
--- a/chromium/ui/aura/window_tree_host.cc
+++ b/chromium/ui/aura/window_tree_host.cc
@@ -6,7 +6,6 @@
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
-#include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "components/viz/common/features.h"
@@ -504,13 +503,18 @@ void WindowTreeHost::OnHostLostWindowCapture() {
 
 void WindowTreeHost::OnDisplayMetricsChanged(const display::Display& display,
                                              uint32_t metrics) {
-  if (metrics & DisplayObserver::DISPLAY_METRIC_COLOR_SPACE) {
-    display::Screen* screen = display::Screen::GetScreen();
-    if (compositor_ &&
-        display.id() == screen->GetDisplayNearestView(window()).id()) {
-      compositor_->SetDisplayColorSpaces(display.color_spaces());
-    }
-  }
+  if (metrics & DisplayObserver::DISPLAY_METRIC_COLOR_SPACE && compositor_ &&
+      display.id() == GetDisplayId())
+    compositor_->SetDisplayColorSpaces(display.color_spaces());
+
+// Chrome OS is handled in WindowTreeHostManager::OnDisplayMetricsChanged.
+// Chrome OS requires additional handling for the bounds that we do not need to
+// do for other OSes.
+#if !defined(OS_CHROMEOS)
+  if (metrics & DISPLAY_METRIC_DEVICE_SCALE_FACTOR &&
+      display.id() == GetDisplayId())
+    OnHostResizedInPixels(GetBoundsInPixels().size());
+#endif
 }
 
 gfx::Rect WindowTreeHost::GetTransformedRootWindowBoundsInPixels(
@@ -549,15 +553,11 @@ void WindowTreeHost::OnCompositingEnded(ui::Compositor* compositor) {
 
   dispatcher_->ReleasePointerMoves();
   holding_pointer_moves_ = false;
-  DCHECK(!synchronization_start_time_.is_null());
-  UMA_HISTOGRAM_TIMES("UI.WindowTreeHost.SurfaceSynchronizationDuration",
-                      base::TimeTicks::Now() - synchronization_start_time_);
 }
 
 void WindowTreeHost::OnCompositingChildResizing(ui::Compositor* compositor) {
   if (!Env::GetInstance()->throttle_input_on_resize() || holding_pointer_moves_)
     return;
-  synchronization_start_time_ = base::TimeTicks::Now();
   dispatcher_->HoldPointerMoves();
   holding_pointer_moves_ = true;
 }