Plumbing input event latency reporting through Mus GPU.

cc/surfaces/compositor_frame_sink_support_unittest.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/surfaces/compositor_frame_sink_support.h"
 
 #include "base/debug/stack_trace.h"
 #include "base/macros.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/compositor_frame_sink_support_client.h"
@@ skipping 808 matching lines @@
   EXPECT_TRUE(surface->HasActiveFrame());
   EXPECT_FALSE(surface->HasPendingFrame());
 
   // Verify that the new surface has both latency info elements.
   std::vector<ui::LatencyInfo> info_list;
   surface->TakeLatencyInfo(&info_list);
   EXPECT_EQ(2u, info_list.size());
 
   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
 // one when LocalSurfaceId changes. Old surface has unresolved dependencies.
 TEST_F(CompositorFrameSinkSupportTest,
        LatencyInfoCarriedOverOnResize_OldSurfaceHasPendingAndActiveFrame) {
   const SurfaceId parent_id1 = MakeSurfaceId(kParentFrameSink, 1);
   const SurfaceId parent_id2 = MakeSurfaceId(kParentFrameSink, 2);
   const SurfaceId child_id = MakeSurfaceId(kChildFrameSink1, 1);
 
@@ skipping 42 matching lines @@
   EXPECT_FALSE(surface->HasPendingFrame());
 
   // Verify that the new surface has latency info from both active and pending
   // frame of the old surface.
   std::vector<ui::LatencyInfo> info_list;
   surface->TakeLatencyInfo(&info_list);
   EXPECT_EQ(2u, info_list.size());
 
   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
 // one when LocalSurfaceId changes. The new surface has unresolved dependencies.
 TEST_F(CompositorFrameSinkSupportTest,
        LatencyInfoCarriedOverOnResize_NewSurfaceHasPendingFrame) {
   const SurfaceId parent_id1 = MakeSurfaceId(kParentFrameSink, 1);
   const SurfaceId parent_id2 = MakeSurfaceId(kParentFrameSink, 2);
   const SurfaceId child_id = MakeSurfaceId(kChildFrameSink1, 1);
 
@@ skipping 45 matching lines @@
   EXPECT_TRUE(surface->HasActiveFrame());
 
   // Both latency info elements must exist in the now-activated frame of the
   // new surface.
   std::vector<ui::LatencyInfo> info_list;
   surface->TakeLatencyInfo(&info_list);
   EXPECT_EQ(2u, info_list.size());
 
   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) {
   const SurfaceId display_id = MakeSurfaceId(kDisplayFrameSink, 1);
 
   // Request BeginFrames.
   display_support().SetNeedsBeginFrame(true);
 
   // Issue a BeginFrame.
   BeginFrameArgs args =
@@ skipping 253 matching lines @@
   EXPECT_FALSE(dependency_tracker().has_deadline());
   EXPECT_FALSE(display_surface()->HasPendingFrame());
   EXPECT_TRUE(display_surface()->HasActiveFrame());
   EXPECT_THAT(display_surface()->blocking_surfaces(), IsEmpty());
   EXPECT_THAT(GetChildReferences(display_id),
               UnorderedElementsAre(parent_id1, parent_id2));
 }
 
 }  // namespace test
 }  // namespace cc