From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
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 <allan.jensen@qt.io>
---
 chromium/ui/base/layout.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'chromium/ui/base/layout.cc')

diff --git a/chromium/ui/base/layout.cc b/chromium/ui/base/layout.cc
index fce80d356ce..d984586ceee 100644
--- a/chromium/ui/base/layout.cc
+++ b/chromium/ui/base/layout.cc
@@ -22,13 +22,13 @@ namespace ui {
 
 namespace {
 
-std::vector<ScaleFactor>* g_supported_scale_factors = NULL;
+std::vector<ScaleFactor>* g_supported_scale_factors = nullptr;
 
 }  // namespace
 
 void SetSupportedScaleFactors(
     const std::vector<ui::ScaleFactor>& scale_factors) {
-  if (g_supported_scale_factors != NULL)
+  if (g_supported_scale_factors != nullptr)
     delete g_supported_scale_factors;
 
   g_supported_scale_factors = new std::vector<ScaleFactor>(scale_factors);
@@ -49,12 +49,12 @@ void SetSupportedScaleFactors(
 }
 
 const std::vector<ScaleFactor>& GetSupportedScaleFactors() {
-  DCHECK(g_supported_scale_factors != NULL);
+  DCHECK(g_supported_scale_factors != nullptr);
   return *g_supported_scale_factors;
 }
 
 ScaleFactor GetSupportedScaleFactor(float scale) {
-  DCHECK(g_supported_scale_factors != NULL);
+  DCHECK(g_supported_scale_factors != nullptr);
   ScaleFactor closest_match = SCALE_FACTOR_100P;
   float smallest_diff =  std::numeric_limits<float>::max();
   for (size_t i = 0; i < g_supported_scale_factors->size(); ++i) {
@@ -85,7 +85,7 @@ ScopedSetSupportedScaleFactors::ScopedSetSupportedScaleFactors(
     original_scale_factors_ =
         new std::vector<ScaleFactor>(*g_supported_scale_factors);
   } else {
-    original_scale_factors_ = NULL;
+    original_scale_factors_ = nullptr;
   }
   SetSupportedScaleFactors(new_scale_factors);
 }
@@ -96,7 +96,7 @@ ScopedSetSupportedScaleFactors::~ScopedSetSupportedScaleFactors() {
     delete original_scale_factors_;
   } else {
     delete g_supported_scale_factors;
-    g_supported_scale_factors = NULL;
+    g_supported_scale_factors = nullptr;
   }
 }
 
-- 
cgit v1.2.1