| Index: content/browser/renderer_host/input/render_widget_host_latency_tracker_unittest.cc
|
| diff --git a/content/browser/renderer_host/input/render_widget_host_latency_tracker_unittest.cc b/content/browser/renderer_host/input/render_widget_host_latency_tracker_unittest.cc
|
| index d1e1448f0caab9acee2591bb3035ffc8eedd0bac..e7098448c48b3062bc71d50cfc44d58748d5b367 100644
|
| --- a/content/browser/renderer_host/input/render_widget_host_latency_tracker_unittest.cc
|
| +++ b/content/browser/renderer_host/input/render_widget_host_latency_tracker_unittest.cc
|
| @@ -32,23 +32,23 @@ void AddFakeComponentsWithTimeStamp(
|
| ui::LatencyInfo* latency,
|
| base::TimeTicks time_stamp) {
|
| latency->AddLatencyNumberWithTimestamp(ui::INPUT_EVENT_LATENCY_UI_COMPONENT,
|
| - 0, 0, time_stamp, 1);
|
| + 0, time_stamp, 1);
|
| latency->AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0, time_stamp,
|
| + ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, time_stamp,
|
| 1);
|
| latency->AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_GPU_SWAP_BUFFER_COMPONENT, 0, 0, time_stamp, 1);
|
| + ui::INPUT_EVENT_GPU_SWAP_BUFFER_COMPONENT, 0, time_stamp, 1);
|
| latency->AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_RENDERER_SWAP_COMPONENT, 0, 0, time_stamp, 1);
|
| + ui::INPUT_EVENT_LATENCY_RENDERER_SWAP_COMPONENT, 0, time_stamp, 1);
|
| latency->AddLatencyNumberWithTimestamp(
|
| - ui::DISPLAY_COMPOSITOR_RECEIVED_FRAME_COMPONENT, 0, 0, time_stamp, 1);
|
| + ui::DISPLAY_COMPOSITOR_RECEIVED_FRAME_COMPONENT, 0, time_stamp, 1);
|
| }
|
|
|
| void AddFakeComponents(const RenderWidgetHostLatencyTracker& tracker,
|
| ui::LatencyInfo* latency) {
|
| latency->AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_FIRST_SCROLL_UPDATE_ORIGINAL_COMPONENT,
|
| - tracker.latency_component_id(), 0, base::TimeTicks::Now(), 1);
|
| + tracker.latency_component_id(), base::TimeTicks::Now(), 1);
|
| AddFakeComponentsWithTimeStamp(tracker, latency, base::TimeTicks::Now());
|
| }
|
|
|
| @@ -57,12 +57,12 @@ void AddRenderingScheduledComponent(ui::LatencyInfo* latency,
|
| base::TimeTicks time_stamp) {
|
| if (main) {
|
| latency->AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_MAIN_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_MAIN_COMPONENT, 0,
|
| time_stamp, 1);
|
|
|
| } else {
|
| latency->AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_IMPL_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_IMPL_COMPONENT, 0,
|
| time_stamp, 1);
|
| }
|
| }
|
| @@ -237,7 +237,7 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, TestWheelToFirstScrollHistograms) {
|
| ui::LatencyInfo wheel_latency(ui::SourceEventType::WHEEL);
|
| wheel_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_FIRST_SCROLL_UPDATE_ORIGINAL_COMPONENT,
|
| - tracker()->latency_component_id(), 0, now, 1);
|
| + tracker()->latency_component_id(), now, 1);
|
| AddFakeComponentsWithTimeStamp(*tracker(), &wheel_latency, now);
|
| AddRenderingScheduledComponent(&wheel_latency, rendering_on_main, now);
|
| tracker()->OnInputEvent(wheel, &wheel_latency);
|
| @@ -333,7 +333,7 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, TestWheelToScrollHistograms) {
|
| ui::LatencyInfo wheel_latency(ui::SourceEventType::WHEEL);
|
| wheel_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_SCROLL_UPDATE_ORIGINAL_COMPONENT,
|
| - tracker()->latency_component_id(), 0, now, 1);
|
| + tracker()->latency_component_id(), now, 1);
|
| AddFakeComponentsWithTimeStamp(*tracker(), &wheel_latency, now);
|
| AddRenderingScheduledComponent(&wheel_latency, rendering_on_main, now);
|
| tracker()->OnInputEvent(wheel, &wheel_latency);
|
| @@ -408,7 +408,7 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, TestTouchToFirstScrollHistograms) {
|
| ui::LatencyInfo scroll_latency;
|
| scroll_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_FIRST_SCROLL_UPDATE_ORIGINAL_COMPONENT,
|
| - tracker()->latency_component_id(), 0, now, 1);
|
| + tracker()->latency_component_id(), now, 1);
|
| AddFakeComponentsWithTimeStamp(*tracker(), &scroll_latency, now);
|
| AddRenderingScheduledComponent(&scroll_latency, rendering_on_main, now);
|
| tracker()->OnInputEvent(scroll, &scroll_latency);
|
| @@ -429,7 +429,7 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, TestTouchToFirstScrollHistograms) {
|
| base::TimeTicks now = base::TimeTicks::Now();
|
| touch_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_FIRST_SCROLL_UPDATE_ORIGINAL_COMPONENT,
|
| - tracker()->latency_component_id(), 0, now, 1);
|
| + tracker()->latency_component_id(), now, 1);
|
| AddFakeComponentsWithTimeStamp(*tracker(), &touch_latency, now);
|
| AddRenderingScheduledComponent(&touch_latency, rendering_on_main, now);
|
| tracker()->OnInputEvent(touch, &touch_latency);
|
| @@ -532,7 +532,7 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, TestTouchToScrollHistograms) {
|
| ui::LatencyInfo scroll_latency;
|
| scroll_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_SCROLL_UPDATE_ORIGINAL_COMPONENT,
|
| - tracker()->latency_component_id(), 0, now, 1);
|
| + tracker()->latency_component_id(), now, 1);
|
| AddFakeComponentsWithTimeStamp(*tracker(), &scroll_latency, now);
|
| AddRenderingScheduledComponent(&scroll_latency, rendering_on_main, now);
|
| tracker()->OnInputEvent(scroll, &scroll_latency);
|
| @@ -553,7 +553,7 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, TestTouchToScrollHistograms) {
|
| base::TimeTicks now = base::TimeTicks::Now();
|
| touch_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_SCROLL_UPDATE_ORIGINAL_COMPONENT,
|
| - tracker()->latency_component_id(), 0, now, 1);
|
| + tracker()->latency_component_id(), now, 1);
|
| AddFakeComponentsWithTimeStamp(*tracker(), &touch_latency, now);
|
| AddRenderingScheduledComponent(&touch_latency, rendering_on_main, now);
|
| tracker()->OnInputEvent(touch, &touch_latency);
|
| @@ -737,7 +737,7 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, ScrollLatency) {
|
| auto scroll_begin = SyntheticWebGestureEventBuilder::BuildScrollBegin(
|
| 5, -5, blink::kWebGestureDeviceTouchscreen);
|
| ui::LatencyInfo scroll_latency;
|
| - scroll_latency.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0,
|
| + scroll_latency.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT,
|
| 0);
|
| tracker()->OnInputEvent(scroll_begin, &scroll_latency);
|
| EXPECT_TRUE(
|
| @@ -750,7 +750,7 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, ScrollLatency) {
|
| auto first_scroll_update = SyntheticWebGestureEventBuilder::BuildScrollUpdate(
|
| 5.f, -5.f, 0, blink::kWebGestureDeviceTouchscreen);
|
| scroll_latency = ui::LatencyInfo();
|
| - scroll_latency.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0,
|
| + scroll_latency.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT,
|
| 0);
|
| tracker()->OnInputEvent(first_scroll_update, &scroll_latency);
|
| EXPECT_TRUE(
|
| @@ -769,7 +769,7 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, ScrollLatency) {
|
| auto scroll_update = SyntheticWebGestureEventBuilder::BuildScrollUpdate(
|
| -5.f, 5.f, 0, blink::kWebGestureDeviceTouchscreen);
|
| scroll_latency = ui::LatencyInfo();
|
| - scroll_latency.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0,
|
| + scroll_latency.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT,
|
| 0);
|
| tracker()->OnInputEvent(scroll_update, &scroll_latency);
|
| EXPECT_TRUE(
|
| @@ -805,19 +805,19 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, TouchBlockingAndQueueingTime) {
|
| fake_latency.set_source_event_type(ui::SourceEventType::TOUCH);
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
|
| - tracker()->latency_component_id(), 0,
|
| + tracker()->latency_component_id(),
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchstart_timestamps_ms[0]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchstart_timestamps_ms[1]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchstart_timestamps_ms[2]),
|
| 1);
|
| @@ -851,19 +851,19 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, TouchBlockingAndQueueingTime) {
|
| fake_latency.set_source_event_type(ui::SourceEventType::TOUCH);
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
|
| - tracker()->latency_component_id(), 0,
|
| + tracker()->latency_component_id(),
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchmove_timestamps_ms[0]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchmove_timestamps_ms[1]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchmove_timestamps_ms[2]),
|
| 1);
|
| @@ -894,19 +894,19 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, TouchBlockingAndQueueingTime) {
|
| fake_latency.set_source_event_type(ui::SourceEventType::TOUCH);
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
|
| - tracker()->latency_component_id(), 0,
|
| + tracker()->latency_component_id(),
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchend_timestamps_ms[0]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchend_timestamps_ms[1]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchend_timestamps_ms[2]),
|
| 1);
|
| @@ -996,19 +996,19 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, KeyBlockingAndQueueingTime) {
|
| fake_latency.set_source_event_type(ui::SourceEventType::KEY_PRESS);
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
|
| - tracker()->latency_component_id(), 0,
|
| + tracker()->latency_component_id(),
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(event_timestamps_ms[0]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(event_timestamps_ms[1]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(event_timestamps_ms[2]),
|
| 1);
|
| @@ -1051,14 +1051,14 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, KeyUILatency) {
|
| ui::LatencyInfo latency_info;
|
| latency_info.set_source_event_type(ui::SourceEventType::KEY_PRESS);
|
| latency_info.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMicroseconds(event_timestamps_microseconds[0]),
|
| 1);
|
|
|
| latency_info.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
|
| - tracker()->latency_component_id(), 0,
|
| + tracker()->latency_component_id(),
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMicroseconds(event_timestamps_microseconds[1]),
|
| 1);
|
| @@ -1085,13 +1085,13 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, KeyAckedLatency) {
|
|
|
| latency_info.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
|
| - tracker()->latency_component_id(), 0,
|
| + tracker()->latency_component_id(),
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMicroseconds(event_timestamps_microseconds[0]),
|
| 1);
|
|
|
| latency_info.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMicroseconds(event_timestamps_microseconds[1]),
|
| 1);
|
| @@ -1117,26 +1117,26 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, KeyEndToEndLatency) {
|
| ui::LatencyInfo latency_info;
|
| latency_info.set_source_event_type(ui::SourceEventType::KEY_PRESS);
|
| latency_info.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMicroseconds(event_timestamps_microseconds[0]),
|
| 1);
|
|
|
| latency_info.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
|
| - tracker()->latency_component_id(), 0,
|
| + tracker()->latency_component_id(),
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMicroseconds(event_timestamps_microseconds[0]),
|
| 1);
|
|
|
| latency_info.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_GPU_SWAP_BUFFER_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_GPU_SWAP_BUFFER_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMicroseconds(event_timestamps_microseconds[1]),
|
| 1);
|
|
|
| latency_info.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMicroseconds(event_timestamps_microseconds[1]),
|
| 1);
|
| @@ -1176,19 +1176,19 @@ TEST_F(RenderWidgetHostLatencyTrackerTest,
|
| ui::LatencyInfo fake_latency;
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
|
| - tracker()->latency_component_id(), 0,
|
| + tracker()->latency_component_id(),
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchstart_timestamps_ms[0]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchstart_timestamps_ms[1]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0,
|
| base::TimeTicks() +
|
| base::TimeDelta::FromMilliseconds(touchstart_timestamps_ms[2]),
|
| 1);
|
| @@ -1246,17 +1246,17 @@ TEST_F(RenderWidgetHostLatencyTrackerTest, WheelDuringMultiFingerTouch) {
|
| fake_latency.set_source_event_type(ui::SourceEventType::TOUCH);
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
|
| - tracker()->latency_component_id(), 0,
|
| + tracker()->latency_component_id(),
|
| base::TimeTicks() + base::TimeDelta::FromMilliseconds(timestamps_ms[0]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_RENDERER_MAIN_COMPONENT, 0,
|
| base::TimeTicks() + base::TimeDelta::FromMilliseconds(timestamps_ms[1]),
|
| 1);
|
|
|
| fake_latency.AddLatencyNumberWithTimestamp(
|
| - ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0, 0,
|
| + ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT, 0,
|
| base::TimeTicks() + base::TimeDelta::FromMilliseconds(timestamps_ms[2]),
|
| 1);
|
|
|
|
|