BASELINE: Update Chromium to 100.0.4896.167

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

1 files changed, 55 insertions, 58 deletions

diff --git a/chromium/cc/metrics/compositor_frame_reporter_unittest.cc b/chromium/cc/metrics/compositor_frame_reporter_unittest.cc
index de005ae8148..31c54a44282 100644
--- a/chromium/cc/metrics/compositor_frame_reporter_unittest.cc
+++ b/chromium/cc/metrics/compositor_frame_reporter_unittest.cc
@@ -51,13 +51,12 @@ class CompositorFrameReporterTest : public testing::Test {
     breakdown->layout_update = base::Microseconds(7);
     breakdown->compositing_inputs = base::Microseconds(6);
     breakdown->prepaint = base::Microseconds(5);
-    breakdown->compositing_assignments = base::Microseconds(4);
     breakdown->paint = base::Microseconds(3);
     breakdown->composite_commit = base::Microseconds(2);
     breakdown->update_layers = base::Microseconds(1);
 
     // Advance now by the sum of the breakdowns.
-    AdvanceNowByMs(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1);
+    AdvanceNowByMs(10 + 9 + 8 + 7 + 6 + 5 + 3 + 2 + 1);
 
     return breakdown;
   }
@@ -72,14 +71,8 @@ class CompositorFrameReporterTest : public testing::Test {
     return viz_breakdown;
   }
 
-  std::unique_ptr<EventMetrics> CreateEventMetrics(
-      ui::EventType type,
-      absl::optional<EventMetrics::GestureParams> gesture_params =
-          absl::nullopt) {
-    const base::TimeTicks event_time = AdvanceNowByMs(3);
-    AdvanceNowByMs(3);
-    std::unique_ptr<EventMetrics> metrics = EventMetrics::CreateForTesting(
-        type, gesture_params, event_time, &test_tick_clock_);
+  std::unique_ptr<EventMetrics> SetupEventMetrics(
+      std::unique_ptr<EventMetrics> metrics) {
     if (metrics) {
       AdvanceNowByMs(3);
       metrics->SetDispatchStageTimestamp(
@@ -88,10 +81,43 @@ class CompositorFrameReporterTest : public testing::Test {
       metrics->SetDispatchStageTimestamp(
           EventMetrics::DispatchStage::kRendererCompositorFinished);
     }
-
     return metrics;
   }
 
+  std::unique_ptr<EventMetrics> CreateEventMetrics(ui::EventType type) {
+    const base::TimeTicks event_time = AdvanceNowByMs(3);
+    AdvanceNowByMs(3);
+    return SetupEventMetrics(
+        EventMetrics::CreateForTesting(type, event_time, &test_tick_clock_));
+  }
+
+  std::unique_ptr<EventMetrics> CreateScrollBeginMetrics() {
+    const base::TimeTicks event_time = AdvanceNowByMs(3);
+    AdvanceNowByMs(3);
+    return SetupEventMetrics(ScrollEventMetrics::CreateForTesting(
+        ui::ET_GESTURE_SCROLL_BEGIN, ui::ScrollInputType::kWheel,
+        /*is_inertial=*/false, event_time, &test_tick_clock_));
+  }
+
+  std::unique_ptr<EventMetrics> CreateScrollUpdateEventMetrics(
+      bool is_inertial,
+      ScrollUpdateEventMetrics::ScrollUpdateType scroll_update_type) {
+    const base::TimeTicks event_time = AdvanceNowByMs(3);
+    AdvanceNowByMs(3);
+    return SetupEventMetrics(ScrollUpdateEventMetrics::CreateForTesting(
+        ui::ET_GESTURE_SCROLL_UPDATE, ui::ScrollInputType::kWheel, is_inertial,
+        scroll_update_type, /*delta=*/10.0f, event_time, &test_tick_clock_));
+  }
+
+  std::unique_ptr<EventMetrics> CreatePinchEventMetrics(
+      ui::EventType type,
+      ui::ScrollInputType input_type) {
+    const base::TimeTicks event_time = AdvanceNowByMs(3);
+    AdvanceNowByMs(3);
+    return SetupEventMetrics(PinchEventMetrics::CreateForTesting(
+        type, input_type, event_time, &test_tick_clock_));
+  }
+
   std::vector<base::TimeTicks> GetEventTimestamps(
       const EventMetrics::List& events_metrics) {
     std::vector<base::TimeTicks> event_times;
@@ -361,22 +387,16 @@ TEST_F(CompositorFrameReporterTest,
   const bool kScrollIsInertial = true;
   const bool kScrollIsNotInertial = false;
   std::unique_ptr<EventMetrics> event_metrics_ptrs[] = {
-      CreateEventMetrics(
-          ui::ET_GESTURE_SCROLL_BEGIN,
-          EventMetrics::GestureParams(ui::ScrollInputType::kWheel,
-                                      kScrollIsNotInertial)),
-      CreateEventMetrics(ui::ET_GESTURE_SCROLL_UPDATE,
-                         EventMetrics::GestureParams(
-                             ui::ScrollInputType::kWheel, kScrollIsNotInertial,
-                             EventMetrics::ScrollUpdateType::kStarted)),
-      CreateEventMetrics(ui::ET_GESTURE_SCROLL_UPDATE,
-                         EventMetrics::GestureParams(
-                             ui::ScrollInputType::kWheel, kScrollIsNotInertial,
-                             EventMetrics::ScrollUpdateType::kContinued)),
-      CreateEventMetrics(ui::ET_GESTURE_SCROLL_UPDATE,
-                         EventMetrics::GestureParams(
-                             ui::ScrollInputType::kWheel, kScrollIsInertial,
-                             EventMetrics::ScrollUpdateType::kContinued)),
+      CreateScrollBeginMetrics(),
+      CreateScrollUpdateEventMetrics(
+          kScrollIsNotInertial,
+          ScrollUpdateEventMetrics::ScrollUpdateType::kStarted),
+      CreateScrollUpdateEventMetrics(
+          kScrollIsNotInertial,
+          ScrollUpdateEventMetrics::ScrollUpdateType::kContinued),
+      CreateScrollUpdateEventMetrics(
+          kScrollIsInertial,
+          ScrollUpdateEventMetrics::ScrollUpdateType::kContinued),
   };
   EXPECT_THAT(event_metrics_ptrs, Each(NotNull()));
   EventMetrics::List events_metrics(
@@ -415,15 +435,9 @@ TEST_F(CompositorFrameReporterTest,
     const base::HistogramBase::Count count;
   } expected_counts[] = {
       {"EventLatency.GestureScrollBegin.Wheel.TotalLatency", 1},
-      {"EventLatency.GestureScrollBegin.Wheel.TotalLatencyToSwapBegin", 1},
       {"EventLatency.FirstGestureScrollUpdate.Wheel.TotalLatency", 1},
-      {"EventLatency.FirstGestureScrollUpdate.Wheel.TotalLatencyToSwapBegin",
-       1},
       {"EventLatency.GestureScrollUpdate.Wheel.TotalLatency", 1},
-      {"EventLatency.GestureScrollUpdate.Wheel.TotalLatencyToSwapBegin", 1},
       {"EventLatency.InertialGestureScrollUpdate.Wheel.TotalLatency", 1},
-      {"EventLatency.InertialGestureScrollUpdate.Wheel.TotalLatencyToSwapBegin",
-       1},
       {"EventLatency.TotalLatency", 4},
   };
   for (const auto& expected_count : expected_counts) {
@@ -433,7 +447,6 @@ TEST_F(CompositorFrameReporterTest,
 
   const base::TimeTicks presentation_time =
       viz_breakdown.presentation_feedback.timestamp;
-  const base::TimeTicks swap_begin_time = viz_breakdown.swap_timings.swap_start;
   struct {
     const char* name;
     const base::HistogramBase::Sample latency_ms;
@@ -441,27 +454,15 @@ TEST_F(CompositorFrameReporterTest,
       {"EventLatency.GestureScrollBegin.Wheel.TotalLatency",
        static_cast<base::HistogramBase::Sample>(
            (presentation_time - event_times[0]).InMicroseconds())},
-      {"EventLatency.GestureScrollBegin.Wheel.TotalLatencyToSwapBegin",
-       static_cast<base::HistogramBase::Sample>(
-           (swap_begin_time - event_times[0]).InMicroseconds())},
       {"EventLatency.FirstGestureScrollUpdate.Wheel.TotalLatency",
        static_cast<base::HistogramBase::Sample>(
            (presentation_time - event_times[1]).InMicroseconds())},
-      {"EventLatency.FirstGestureScrollUpdate.Wheel.TotalLatencyToSwapBegin",
-       static_cast<base::HistogramBase::Sample>(
-           (swap_begin_time - event_times[1]).InMicroseconds())},
       {"EventLatency.GestureScrollUpdate.Wheel.TotalLatency",
        static_cast<base::HistogramBase::Sample>(
            (presentation_time - event_times[2]).InMicroseconds())},
-      {"EventLatency.GestureScrollUpdate.Wheel.TotalLatencyToSwapBegin",
-       static_cast<base::HistogramBase::Sample>(
-           (swap_begin_time - event_times[2]).InMicroseconds())},
       {"EventLatency.InertialGestureScrollUpdate.Wheel.TotalLatency",
        static_cast<base::HistogramBase::Sample>(
            (presentation_time - event_times[3]).InMicroseconds())},
-      {"EventLatency.InertialGestureScrollUpdate.Wheel.TotalLatencyToSwapBegin",
-       static_cast<base::HistogramBase::Sample>(
-           (swap_begin_time - event_times[3]).InMicroseconds())},
   };
   for (const auto& expected_latency : expected_latencies) {
     histogram_tester.ExpectBucketCount(expected_latency.name,
@@ -476,18 +477,14 @@ TEST_F(CompositorFrameReporterTest,
   base::HistogramTester histogram_tester;
 
   std::unique_ptr<EventMetrics> event_metrics_ptrs[] = {
-      CreateEventMetrics(
-          ui::ET_GESTURE_PINCH_BEGIN,
-          EventMetrics::GestureParams(ui::ScrollInputType::kWheel)),
-      CreateEventMetrics(
-          ui::ET_GESTURE_PINCH_UPDATE,
-          EventMetrics::GestureParams(ui::ScrollInputType::kWheel)),
-      CreateEventMetrics(
-          ui::ET_GESTURE_PINCH_BEGIN,
-          EventMetrics::GestureParams(ui::ScrollInputType::kTouchscreen)),
-      CreateEventMetrics(
-          ui::ET_GESTURE_PINCH_UPDATE,
-          EventMetrics::GestureParams(ui::ScrollInputType::kTouchscreen)),
+      CreatePinchEventMetrics(ui::ET_GESTURE_PINCH_BEGIN,
+                              ui::ScrollInputType::kWheel),
+      CreatePinchEventMetrics(ui::ET_GESTURE_PINCH_UPDATE,
+                              ui::ScrollInputType::kWheel),
+      CreatePinchEventMetrics(ui::ET_GESTURE_PINCH_BEGIN,
+                              ui::ScrollInputType::kTouchscreen),
+      CreatePinchEventMetrics(ui::ET_GESTURE_PINCH_UPDATE,
+                              ui::ScrollInputType::kTouchscreen),
   };
   EXPECT_THAT(event_metrics_ptrs, Each(NotNull()));
   EventMetrics::List events_metrics(