Limit the size of latency info storage

cc/surfaces/display_unittest.cc

 // Copyright 2015 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/display.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/test/null_task_runner.h"
@@ skipping 417 matching lines @@
     EXPECT_EQ(6u, output_surface_->num_sent_frames());
     EXPECT_EQ(gfx::Size(100, 100),
               software_output_device_->viewport_pixel_size());
     EXPECT_EQ(gfx::Rect(0, 0, 100, 100),
               software_output_device_->damage_rect());
     EXPECT_EQ(0u, output_surface_->last_sent_frame()->latency_info.size());
   }
   TearDownDisplay();
 }
 
+// Check LatencyInfo storage is cleaned up if it exceeds the limit.
+TEST_F(DisplayTest, MaxLatencyInfoCap) {
+  RendererSettings settings;
+  settings.partial_swap_enabled = true;
+  settings.finish_rendering_on_resize = true;
+  SetUpDisplay(settings, nullptr);
+  gfx::ColorSpace color_space_1 = gfx::ColorSpace::CreateXYZD50();
+  gfx::ColorSpace color_space_2 = gfx::ColorSpace::CreateSCRGBLinear();
+
+  StubDisplayClient client;
+  display_->Initialize(&client, &manager_);
+  display_->SetColorSpace(color_space_1, color_space_1);
+
+  LocalSurfaceId local_surface_id(id_allocator_.GenerateId());
+  display_->SetLocalSurfaceId(local_surface_id, 1.f);
+
+  scheduler_->ResetDamageForTest();
+  display_->Resize(gfx::Size(100, 100));
+
+  RenderPassList pass_list;
+  std::unique_ptr<RenderPass> pass = RenderPass::Create();
+  pass->output_rect = gfx::Rect(0, 0, 100, 100);
+  pass->damage_rect = gfx::Rect(10, 10, 1, 1);
+  pass->id = 1u;
+  pass_list.push_back(std::move(pass));
+
+  scheduler_->ResetDamageForTest();
+  SubmitCompositorFrame(&pass_list, local_surface_id);
+
+  display_->DrawAndSwap();
+
+  // This is the same as LatencyInfo::kMaxLAtencyInfoNumber.

[tdresser, 2017/07/04 16:41:04]

kMaxLA -> kMaxLa

[Navid Zolghadr, 2017/07/04 17:16:28]

Done.

+  const size_t max_latency_info_count = 100;
+  for (size_t i = 0; i <= max_latency_info_count; ++i) {
+    pass = RenderPass::Create();
+    pass->output_rect = gfx::Rect(0, 0, 100, 100);
+    pass->damage_rect = gfx::Rect(10, 10, 0, 0);
+    pass->id = 1u;
+
+    pass_list.push_back(std::move(pass));
+    scheduler_->ResetDamageForTest();
+
+    CompositorFrame frame = test::MakeCompositorFrame();
+    pass_list.swap(frame.render_pass_list);
+    frame.metadata.latency_info.push_back(ui::LatencyInfo());
+
+    support_->SubmitCompositorFrame(local_surface_id, std::move(frame));
+
+    display_->DrawAndSwap();
+    EXPECT_EQ(i < max_latency_info_count ? (i + 1) : 0,
+              display_->stored_latency_info_size_for_testing());

[tdresser, 2017/07/04 16:41:04]

I think this would be a bit easier to read if you had two EXPECT statements
inside a conditional.

[Navid Zolghadr, 2017/07/04 17:16:28]

Done.

+  }
+
+  TearDownDisplay();
+}
+
 class MockedContext : public TestWebGraphicsContext3D {
  public:
   MOCK_METHOD0(shallowFinishCHROMIUM, void());
 };
 
 TEST_F(DisplayTest, Finish) {
   LocalSurfaceId local_surface_id1(id_allocator_.GenerateId());
   LocalSurfaceId local_surface_id2(id_allocator_.GenerateId());
 
   RendererSettings settings;
@@ skipping 140 matching lines @@
 
   // Should have damaged only display_ but not display2.
   EXPECT_TRUE(scheduler_->damaged);
   EXPECT_FALSE(scheduler2->damaged);
   manager_.UnregisterBeginFrameSource(begin_frame_source2.get());
   TearDownDisplay();
 }
 
 }  // namespace
 }  // namespace cc