Index: cc/surfaces/compositor_frame_sink_support_unittest.cc |
diff --git a/cc/surfaces/compositor_frame_sink_support_unittest.cc b/cc/surfaces/compositor_frame_sink_support_unittest.cc |
index 44771bfffaaa919917cefdf9d9ddd0cc19da079f..bdcd20e35643aab69502177c4511a46d265a5ccb 100644 |
--- a/cc/surfaces/compositor_frame_sink_support_unittest.cc |
+++ b/cc/surfaces/compositor_frame_sink_support_unittest.cc |
@@ -815,12 +815,20 @@ TEST_F(CompositorFrameSinkSupportTest, |
ui::LatencyInfo aggregated_latency_info = info_list[0]; |
aggregated_latency_info.AddNewLatencyFrom(info_list[1]); |
- EXPECT_EQ(2u, aggregated_latency_info.latency_components().size()); |
+ |
+ // Two components are the original ones, and the third one is |
+ // DISPLAY_COMPOSITOR_RECEIVED_FRAME_COMPONENT, logged on compositor frame |
+ // submit. |
+ EXPECT_EQ(3u, aggregated_latency_info.latency_components().size()); |
ui::LatencyInfo::LatencyComponent comp1; |
EXPECT_TRUE( |
aggregated_latency_info.FindLatency(latency_type1, latency_id1, &comp1)); |
EXPECT_EQ(latency_sequence_number1, comp1.sequence_number); |
+ EXPECT_TRUE( |
+ aggregated_latency_info.FindLatency(latency_type2, latency_id2, nullptr)); |
+ EXPECT_TRUE(aggregated_latency_info.FindLatency( |
+ ui::DISPLAY_COMPOSITOR_RECEIVED_FRAME_COMPONENT, nullptr)); |
} |
// Checks whether the latency info are moved to the new surface from the old |
@@ -883,12 +891,20 @@ TEST_F(CompositorFrameSinkSupportTest, |
ui::LatencyInfo aggregated_latency_info = info_list[0]; |
aggregated_latency_info.AddNewLatencyFrom(info_list[1]); |
- EXPECT_EQ(2u, aggregated_latency_info.latency_components().size()); |
+ |
+ // Two components are the original ones, and the third one is |
+ // DISPLAY_COMPOSITOR_RECEIVED_FRAME_COMPONENT, logged on compositor frame |
+ // submit. |
+ EXPECT_EQ(3u, aggregated_latency_info.latency_components().size()); |
ui::LatencyInfo::LatencyComponent comp1; |
EXPECT_TRUE( |
aggregated_latency_info.FindLatency(latency_type1, latency_id1, &comp1)); |
EXPECT_EQ(latency_sequence_number1, comp1.sequence_number); |
+ EXPECT_TRUE( |
+ aggregated_latency_info.FindLatency(latency_type2, latency_id2, nullptr)); |
+ EXPECT_TRUE(aggregated_latency_info.FindLatency( |
+ ui::DISPLAY_COMPOSITOR_RECEIVED_FRAME_COMPONENT, nullptr)); |
} |
// Checks whether the latency info are moved to the new surface from the old |
@@ -954,12 +970,20 @@ TEST_F(CompositorFrameSinkSupportTest, |
ui::LatencyInfo aggregated_latency_info = info_list[0]; |
aggregated_latency_info.AddNewLatencyFrom(info_list[1]); |
- EXPECT_EQ(2u, aggregated_latency_info.latency_components().size()); |
+ |
+ // Two components are the original ones, and the third one is |
+ // DISPLAY_COMPOSITOR_RECEIVED_FRAME_COMPONENT, logged on compositor frame |
+ // submit. |
+ EXPECT_EQ(3u, aggregated_latency_info.latency_components().size()); |
ui::LatencyInfo::LatencyComponent comp1; |
EXPECT_TRUE( |
aggregated_latency_info.FindLatency(latency_type1, latency_id1, &comp1)); |
EXPECT_EQ(latency_sequence_number1, comp1.sequence_number); |
+ EXPECT_TRUE( |
+ aggregated_latency_info.FindLatency(latency_type2, latency_id2, nullptr)); |
+ EXPECT_TRUE(aggregated_latency_info.FindLatency( |
+ ui::DISPLAY_COMPOSITOR_RECEIVED_FRAME_COMPONENT, nullptr)); |
} |
TEST_F(CompositorFrameSinkSupportTest, PassesOnBeginFrameAcks) { |