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_util.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chromium/ui/display/manager/display_util.cc') diff --git a/chromium/ui/display/manager/display_util.cc b/chromium/ui/display/manager/display_util.cc index 310e6293da6..c6b5b32b23a 100644 --- a/chromium/ui/display/manager/display_util.cc +++ b/chromium/ui/display/manager/display_util.cc @@ -62,10 +62,6 @@ constexpr std::array kZoomListBucketsForDsf{{ {1.f / kDsf_2_666, 0.5f, 0.6f, 0.8f, 0.9f, 1.f, 1.2f, 1.35f, 1.5f}}, }}; -bool WithinEpsilon(float a, float b) { - return std::abs(a - b) < std::numeric_limits::epsilon(); -} - } // namespace #if defined(OS_CHROMEOS) @@ -108,6 +104,10 @@ int GetDisplayPower(const std::vector& displays, #endif // defined(OS_CHROMEOS) +bool WithinEpsilon(float a, float b) { + return std::abs(a - b) < std::numeric_limits::epsilon(); +} + std::string MultipleDisplayStateToString(MultipleDisplayState state) { switch (state) { case MULTIPLE_DISPLAY_STATE_INVALID: -- cgit v1.2.1