Introduce cc::LocalFrameId and use in SurfaceFactory

cc/surfaces/display_scheduler_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_scheduler.h"
 
 #include "base/logging.h"
 #include "base/test/null_task_runner.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 88 matching lines @@
 
   FakeExternalBeginFrameSource fake_begin_frame_source_;
 
   base::SimpleTestTickClock now_src_;
   scoped_refptr<base::NullTaskRunner> task_runner_;
   FakeDisplaySchedulerClient client_;
   TestDisplayScheduler scheduler_;
 };
 
 TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
-  SurfaceId root_surface_id1(kArbitraryFrameSinkId, 1, 0);
-  SurfaceId root_surface_id2(kArbitraryFrameSinkId, 2, 0);
-  SurfaceId sid1(kArbitraryFrameSinkId, 3, 0);
+  SurfaceId root_surface_id1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
+  SurfaceId root_surface_id2(kArbitraryFrameSinkId, LocalFrameId(2, 0));
+  SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(3, 0));
   base::TimeTicks late_deadline;
 
   scheduler_.SetVisible(true);
 
   // Go trough an initial BeginFrame cycle with the root surface.
   BeginFrameForTest();
   scheduler_.SetNewRootSurface(root_surface_id1);
   scheduler_.BeginFrameDeadlineForTest();
 
   // Resize on the next begin frame cycle should cause the deadline to wait
@@ skipping 14 matching lines @@
   BeginFrameForTest();
   scheduler_.SurfaceDamaged(sid1);
   EXPECT_GT(late_deadline, scheduler_.DesiredBeginFrameDeadlineTimeForTest());
   scheduler_.SurfaceDamaged(root_surface_id2);
   EXPECT_GE(now_src().NowTicks(),
             scheduler_.DesiredBeginFrameDeadlineTimeForTest());
   scheduler_.BeginFrameDeadlineForTest();
 }
 
 TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilDamagedSurface) {
-  SurfaceId root_surface_id(kArbitraryFrameSinkId, 1, 0);
-  SurfaceId sid1(kArbitraryFrameSinkId, 2, 0);
+  SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(1, 0));
+  SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(2, 0));
   base::TimeTicks late_deadline;
 
   scheduler_.SetVisible(true);
 
   // Go trough an initial BeginFrame cycle with the root surface.
   BeginFrameForTest();
   scheduler_.SetNewRootSurface(root_surface_id);
   scheduler_.BeginFrameDeadlineForTest();
 
   // Resize on the next begin frame cycle should cause the deadline to wait
@@ skipping 14 matching lines @@
   BeginFrameForTest();
   scheduler_.SurfaceDamaged(sid1);
   EXPECT_GT(late_deadline, scheduler_.DesiredBeginFrameDeadlineTimeForTest());
   scheduler_.SurfaceDamaged(root_surface_id);
   EXPECT_GE(now_src().NowTicks(),
             scheduler_.DesiredBeginFrameDeadlineTimeForTest());
   scheduler_.BeginFrameDeadlineForTest();
 }
 
 TEST_F(DisplaySchedulerTest, SurfaceDamaged) {
-  SurfaceId root_surface_id(kArbitraryFrameSinkId, 0, 0);
-  SurfaceId sid1(kArbitraryFrameSinkId, 1, 0);
-  SurfaceId sid2(kArbitraryFrameSinkId, 2, 0);
+  SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
+  SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
+  SurfaceId sid2(kArbitraryFrameSinkId, LocalFrameId(2, 0));
 
   scheduler_.SetVisible(true);
 
   // Set the root surface
   scheduler_.SetNewRootSurface(root_surface_id);
 
   // Get scheduler to detect surface 1 as active by drawing
   // two frames in a row with damage from surface 1.
   BeginFrameForTest();
   scheduler_.SurfaceDamaged(sid1);
@@ skipping 43 matching lines @@
   BeginFrameForTest();
   EXPECT_LT(now_src().NowTicks(),
             scheduler_.DesiredBeginFrameDeadlineTimeForTest());
   scheduler_.SurfaceDamaged(root_surface_id);
   EXPECT_GE(now_src().NowTicks(),
             scheduler_.DesiredBeginFrameDeadlineTimeForTest());
   scheduler_.BeginFrameDeadlineForTest();
 }
 
 TEST_F(DisplaySchedulerTest, OutputSurfaceLost) {
-  SurfaceId root_surface_id(kArbitraryFrameSinkId, 0, 0);
-  SurfaceId sid1(kArbitraryFrameSinkId, 1, 0);
+  SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
+  SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
 
   scheduler_.SetVisible(true);
 
   // Set the root surface
   scheduler_.SetNewRootSurface(root_surface_id);
 
   // DrawAndSwap normally.
   BeginFrameForTest();
   EXPECT_LT(now_src().NowTicks(),
             scheduler_.DesiredBeginFrameDeadlineTimeForTest());
@@ skipping 11 matching lines @@
             scheduler_.DesiredBeginFrameDeadlineTimeForTest());
 
   // Deadline does not DrawAndSwap after OutputSurfaceLost.
   EXPECT_EQ(1, client_.draw_and_swap_count());
   scheduler_.SurfaceDamaged(sid1);
   scheduler_.BeginFrameDeadlineForTest();
   EXPECT_EQ(1, client_.draw_and_swap_count());
 }
 
 TEST_F(DisplaySchedulerTest, VisibleWithoutDamageNoTicks) {
-  SurfaceId root_surface_id(kArbitraryFrameSinkId, 0, 0);
-  SurfaceId sid1(kArbitraryFrameSinkId, 1, 0);
+  SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
+  SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
 
   EXPECT_EQ(0u, fake_begin_frame_source_.num_observers());
   scheduler_.SetVisible(true);
 
   // When becoming visible, don't start listening for begin frames until there
   // is some damage.
   EXPECT_EQ(0u, fake_begin_frame_source_.num_observers());
   scheduler_.SetNewRootSurface(root_surface_id);
 
   EXPECT_EQ(1u, fake_begin_frame_source_.num_observers());
 }
 
 TEST_F(DisplaySchedulerTest, VisibleWithDamageTicks) {
-  SurfaceId root_surface_id(kArbitraryFrameSinkId, 0, 0);
-  SurfaceId sid1(kArbitraryFrameSinkId, 1, 0);
+  SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
+  SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
 
   scheduler_.SetNewRootSurface(root_surface_id);
 
   // When there is damage, start listening for begin frames once becoming
   // visible.
   EXPECT_EQ(0u, fake_begin_frame_source_.num_observers());
   scheduler_.SetVisible(true);
 
   EXPECT_EQ(1u, fake_begin_frame_source_.num_observers());
 }
 
 TEST_F(DisplaySchedulerTest, Visibility) {
-  SurfaceId root_surface_id(kArbitraryFrameSinkId, 0, 0);
-  SurfaceId sid1(kArbitraryFrameSinkId, 1, 0);
+  SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
+  SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
 
   scheduler_.SetNewRootSurface(root_surface_id);
   scheduler_.SetVisible(true);
   EXPECT_EQ(1u, fake_begin_frame_source_.num_observers());
 
   // DrawAndSwap normally.
   BeginFrameForTest();
   EXPECT_LT(now_src().NowTicks(),
             scheduler_.DesiredBeginFrameDeadlineTimeForTest());
   EXPECT_EQ(0, client_.draw_and_swap_count());
@@ skipping 27 matching lines @@
   // Does not start listening for begin frames when damage arrives.
   scheduler_.SurfaceDamaged(sid1);
   EXPECT_EQ(0u, fake_begin_frame_source_.num_observers());
 
   // But does when becoming visible with damage again.
   scheduler_.SetVisible(true);
   EXPECT_EQ(1u, fake_begin_frame_source_.num_observers());
 }
 
 TEST_F(DisplaySchedulerTest, ResizeCausesSwap) {
-  SurfaceId root_surface_id(kArbitraryFrameSinkId, 0, 0);
-  SurfaceId sid1(kArbitraryFrameSinkId, 1, 0);
+  SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
+  SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
 
   scheduler_.SetVisible(true);
 
   // Set the root surface
   scheduler_.SetNewRootSurface(root_surface_id);
 
   // DrawAndSwap normally.
   BeginFrameForTest();
   EXPECT_LT(now_src().NowTicks(),
             scheduler_.DesiredBeginFrameDeadlineTimeForTest());
   EXPECT_EQ(0, client_.draw_and_swap_count());
   scheduler_.SurfaceDamaged(sid1);
   scheduler_.BeginFrameDeadlineForTest();
   EXPECT_EQ(1, client_.draw_and_swap_count());
 
   scheduler_.DisplayResized();
   BeginFrameForTest();
   // DisplayResized should trigger a swap to happen.
   scheduler_.BeginFrameDeadlineForTest();
   EXPECT_EQ(2, client_.draw_and_swap_count());
 }
 
 TEST_F(DisplaySchedulerTest, RootSurfaceResourcesLocked) {
-  SurfaceId root_surface_id(kArbitraryFrameSinkId, 0, 0);
-  SurfaceId sid1(kArbitraryFrameSinkId, 1, 0);
+  SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
+  SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
   base::TimeTicks late_deadline;
 
   scheduler_.SetVisible(true);
 
   // Set the root surface
   scheduler_.SetNewRootSurface(root_surface_id);
 
   // DrawAndSwap normally.
   BeginFrameForTest();
   EXPECT_LT(now_src().NowTicks(),
@@ skipping 26 matching lines @@
   scheduler_.SurfaceDamaged(root_surface_id);
   EXPECT_EQ(base::TimeTicks(),
             scheduler_.DesiredBeginFrameDeadlineTimeForTest());
 
   EXPECT_EQ(1, client_.draw_and_swap_count());
   scheduler_.BeginFrameDeadlineForTest();
   EXPECT_EQ(2, client_.draw_and_swap_count());
 }
 
 TEST_F(DisplaySchedulerTest, DidSwapBuffers) {
-  SurfaceId root_surface_id(kArbitraryFrameSinkId, 0, 0);
-  SurfaceId sid1(kArbitraryFrameSinkId, 1, 0);
-  SurfaceId sid2(kArbitraryFrameSinkId, 2, 0);
+  SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
+  SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
+  SurfaceId sid2(kArbitraryFrameSinkId, LocalFrameId(2, 0));
 
   scheduler_.SetVisible(true);
 
   // Set the root surface
   scheduler_.SetNewRootSurface(root_surface_id);
 
   // Get scheduler to detect surface 1 and 2 as active.
   BeginFrameForTest();
   scheduler_.SurfaceDamaged(sid1);
   scheduler_.SurfaceDamaged(sid2);
@@ skipping 44 matching lines @@
             base::TimeTicks());
   // Draw and swap now that we aren't throttled.
   EXPECT_EQ(3, client_.draw_and_swap_count());
   scheduler_.BeginFrameDeadlineForTest();
   EXPECT_EQ(4, client_.draw_and_swap_count());
 }
 
 // This test verfies that we try to reschedule the deadline
 // after any event that may change what deadline we want.
 TEST_F(DisplaySchedulerTest, ScheduleBeginFrameDeadline) {
-  SurfaceId root_surface_id(kArbitraryFrameSinkId, 1, 0);
-  SurfaceId sid1(kArbitraryFrameSinkId, 2, 0);
+  SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(1, 0));
+  SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(2, 0));
   int count = 1;
   EXPECT_EQ(count, scheduler_.scheduler_begin_frame_deadline_count());
 
   scheduler_.SetVisible(true);
   EXPECT_EQ(++count, scheduler_.scheduler_begin_frame_deadline_count());
 
   scheduler_.SetVisible(true);
   EXPECT_EQ(count, scheduler_.scheduler_begin_frame_deadline_count());
 
   scheduler_.SetVisible(false);
@@ skipping 32 matching lines @@
 
   scheduler_.SetRootSurfaceResourcesLocked(true);
   EXPECT_EQ(++count, scheduler_.scheduler_begin_frame_deadline_count());
 
   scheduler_.OutputSurfaceLost();
   EXPECT_EQ(++count, scheduler_.scheduler_begin_frame_deadline_count());
 }
 
 }  // namespace
 }  // namespace cc