From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/display/manager/display_manager.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'chromium/ui/display/manager/display_manager.cc') diff --git a/chromium/ui/display/manager/display_manager.cc b/chromium/ui/display/manager/display_manager.cc index 11423d46aae..7d909dddb79 100644 --- a/chromium/ui/display/manager/display_manager.cc +++ b/chromium/ui/display/manager/display_manager.cc @@ -33,6 +33,7 @@ #include "ui/display/display_observer.h" #include "ui/display/display_switches.h" #include "ui/display/manager/display_layout_store.h" +#include "ui/display/manager/display_util.h" #include "ui/display/manager/managed_display_info.h" #include "ui/display/screen.h" #include "ui/display/types/display_snapshot.h" @@ -47,7 +48,6 @@ #include "chromeos/system/devicemode.h" #include "ui/display/manager/display_change_observer.h" #include "ui/display/manager/display_configurator.h" -#include "ui/display/manager/display_util.h" #include "ui/display/types/native_display_delegate.h" #include "ui/events/devices/touchscreen_device.h" #endif @@ -985,6 +985,16 @@ void DisplayManager::UpdateDisplaysWith( if (current_display.rotation() != new_display.rotation()) metrics |= DisplayObserver::DISPLAY_METRIC_ROTATION; + if (!WithinEpsilon(current_display.display_frequency(), + new_display.display_frequency())) { + metrics |= DisplayObserver::DISPLAY_METRIC_REFRESH_RATE; + } + + if (current_display_info.is_interlaced() != + new_display_info.is_interlaced()) { + metrics |= DisplayObserver::DISPLAY_METRIC_INTERLACED; + } + if (metrics != DisplayObserver::DISPLAY_METRIC_NONE) { display_changes.insert( std::pair(new_displays.size(), metrics)); -- cgit v1.2.1