BASELINE: Update Chromium to 94.0.4606.111

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

5 files changed, 25 insertions, 18 deletions

diff --git a/chromium/cc/benchmarks/invalidation_benchmark.cc b/chromium/cc/benchmarks/invalidation_benchmark.cc
index 08402bdc4ac..b54ca5cbb88 100644
--- a/chromium/cc/benchmarks/invalidation_benchmark.cc
+++ b/chromium/cc/benchmarks/invalidation_benchmark.cc
@@ -8,6 +8,8 @@
 
 #include <algorithm>
 #include <limits>
+#include <memory>
+#include <utility>
 
 #include "base/rand_util.h"
 #include "base/values.h"
@@ -131,10 +133,11 @@ bool InvalidationBenchmark::ProcessMessage(std::unique_ptr<base::Value> value) {
 // high quality, but they need to be identical in each run. Therefore, we use a
 // LCG and keep the state locally in the benchmark.
 float InvalidationBenchmark::LCGRandom() {
-  const uint32_t a = 1664525;
-  const uint32_t c = 1013904223;
+  constexpr uint32_t a = 1664525;
+  constexpr uint32_t c = 1013904223;
   seed_ = a * seed_ + c;
-  return static_cast<float>(seed_) / std::numeric_limits<uint32_t>::max();
+  return static_cast<float>(seed_) /
+         static_cast<float>(std::numeric_limits<uint32_t>::max());
 }
 
 }  // namespace cc
diff --git a/chromium/cc/benchmarks/micro_benchmark_controller.cc b/chromium/cc/benchmarks/micro_benchmark_controller.cc
index 3c1b166ac47..07f8a0f4ac6 100644
--- a/chromium/cc/benchmarks/micro_benchmark_controller.cc
+++ b/chromium/cc/benchmarks/micro_benchmark_controller.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/callback.h"
-#include "base/stl_util.h"
+#include "base/containers/cxx20_erase.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "cc/benchmarks/invalidation_benchmark.h"
diff --git a/chromium/cc/benchmarks/micro_benchmark_controller_impl.cc b/chromium/cc/benchmarks/micro_benchmark_controller_impl.cc
index 56a83c7dc19..13624c1cf04 100644
--- a/chromium/cc/benchmarks/micro_benchmark_controller_impl.cc
+++ b/chromium/cc/benchmarks/micro_benchmark_controller_impl.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/callback.h"
-#include "base/stl_util.h"
+#include "base/containers/cxx20_erase.h"
 #include "base/values.h"
 #include "cc/trees/layer_tree_host_impl.h"
 
diff --git a/chromium/cc/benchmarks/rasterize_and_record_benchmark.cc b/chromium/cc/benchmarks/rasterize_and_record_benchmark.cc
index 8095225c5be..1be5bac5396 100644
--- a/chromium/cc/benchmarks/rasterize_and_record_benchmark.cc
+++ b/chromium/cc/benchmarks/rasterize_and_record_benchmark.cc
@@ -75,21 +75,24 @@ void RasterizeAndRecordBenchmark::DidUpdateLayers(
                        static_cast<int>(record_results_.paint_op_memory_usage));
   results_->SetInteger("paint_op_count",
                        static_cast<int>(record_results_.paint_op_count));
-  results_->SetDouble("record_time_ms", paint_benchmark_result.record_time_ms);
-  results_->SetDouble("record_time_caching_disabled_ms",
-                      paint_benchmark_result.record_time_caching_disabled_ms);
-  results_->SetDouble(
+  results_->SetDoubleKey("record_time_ms",
+                         paint_benchmark_result.record_time_ms);
+  results_->SetDoubleKey(
+      "record_time_caching_disabled_ms",
+      paint_benchmark_result.record_time_caching_disabled_ms);
+  results_->SetDoubleKey(
       "record_time_subsequence_caching_disabled_ms",
       paint_benchmark_result.record_time_subsequence_caching_disabled_ms);
-  results_->SetDouble(
+  results_->SetDoubleKey(
       "record_time_partial_invalidation_ms",
       paint_benchmark_result.record_time_partial_invalidation_ms);
-  results_->SetDouble("record_time_small_invalidation_ms",
-                      paint_benchmark_result.record_time_small_invalidation_ms);
-  results_->SetDouble(
+  results_->SetDoubleKey(
+      "record_time_small_invalidation_ms",
+      paint_benchmark_result.record_time_small_invalidation_ms);
+  results_->SetDoubleKey(
       "raster_invalidation_and_convert_time_ms",
       paint_benchmark_result.raster_invalidation_and_convert_time_ms);
-  results_->SetDouble(
+  results_->SetDoubleKey(
       "paint_artifact_compositor_update_time_ms",
       paint_benchmark_result.paint_artifact_compositor_update_time_ms);
   results_->SetInteger(
diff --git a/chromium/cc/benchmarks/rasterize_and_record_benchmark_impl.cc b/chromium/cc/benchmarks/rasterize_and_record_benchmark_impl.cc
index b4c365d128d..deebdaf6f73 100644
--- a/chromium/cc/benchmarks/rasterize_and_record_benchmark_impl.cc
+++ b/chromium/cc/benchmarks/rasterize_and_record_benchmark_impl.cc
@@ -9,6 +9,7 @@
 #include <algorithm>
 #include <limits>
 #include <memory>
+#include <utility>
 
 #include "base/timer/lap_timer.h"
 #include "base/values.h"
@@ -130,8 +131,8 @@ class FixedInvalidationPictureLayerTilingClient
     return base_client_->ScrollInteractionInProgress();
   }
 
-  bool DidCheckerboardQuad() const override {
-    return base_client_->DidCheckerboardQuad();
+  bool CurrentScrollDidCheckerboardLargeArea() const override {
+    return base_client_->CurrentScrollDidCheckerboardLargeArea();
   }
 
  private:
@@ -166,8 +167,8 @@ void RasterizeAndRecordBenchmarkImpl::DidCompleteCommit(
   }
 
   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
-  result->SetDouble("rasterize_time_ms",
-                    rasterize_results_.total_best_time.InMillisecondsF());
+  result->SetDoubleKey("rasterize_time_ms",
+                       rasterize_results_.total_best_time.InMillisecondsF());
   result->SetInteger("pixels_rasterized", rasterize_results_.pixels_rasterized);
   result->SetInteger("pixels_rasterized_with_non_solid_color",
                      rasterize_results_.pixels_rasterized_with_non_solid_color);