Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1494)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/surfaces/display_scheduler_unittest.cc

Issue 2661543002: Rename LocalFrameId to LocalSurfaceId (Closed)
Patch Set: c Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/surfaces/display.cc ('k') | cc/surfaces/display_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/display_scheduler_unittest.cc
diff --git a/cc/surfaces/display_scheduler_unittest.cc b/cc/surfaces/display_scheduler_unittest.cc
index a5a053d8415796047f1dce8ea1a44e890dedb605..e905f3b0ce8d967eba1fce2e6db41441b989cc3a 100644
--- a/cc/surfaces/display_scheduler_unittest.cc
+++ b/cc/surfaces/display_scheduler_unittest.cc
@@ -120,12 +120,14 @@ class DisplaySchedulerTest : public testing::Test {
};
TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
- SurfaceId root_surface_id1(kArbitraryFrameSinkId,
- LocalFrameId(1, base::UnguessableToken::Create()));
- SurfaceId root_surface_id2(kArbitraryFrameSinkId,
- LocalFrameId(2, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id1(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(1, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id2(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(2, base::UnguessableToken::Create()));
SurfaceId sid1(kArbitraryFrameSinkId,
- LocalFrameId(3, base::UnguessableToken::Create()));
+ LocalSurfaceId(3, base::UnguessableToken::Create()));
base::TimeTicks late_deadline;
scheduler_.SetVisible(true);
@@ -160,10 +162,11 @@ TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
}
TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilDamagedSurface) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId,
- LocalFrameId(1, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(1, base::UnguessableToken::Create()));
SurfaceId sid1(kArbitraryFrameSinkId,
- LocalFrameId(2, base::UnguessableToken::Create()));
+ LocalSurfaceId(2, base::UnguessableToken::Create()));
base::TimeTicks late_deadline;
scheduler_.SetVisible(true);
@@ -198,12 +201,13 @@ TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilDamagedSurface) {
}
TEST_F(DisplaySchedulerTest, SurfaceDamaged) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId,
- LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(0, base::UnguessableToken::Create()));
SurfaceId sid1(kArbitraryFrameSinkId,
- LocalFrameId(1, base::UnguessableToken::Create()));
+ LocalSurfaceId(1, base::UnguessableToken::Create()));
SurfaceId sid2(kArbitraryFrameSinkId,
- LocalFrameId(2, base::UnguessableToken::Create()));
+ LocalSurfaceId(2, base::UnguessableToken::Create()));
scheduler_.SetVisible(true);
@@ -266,10 +270,11 @@ TEST_F(DisplaySchedulerTest, SurfaceDamaged) {
}
TEST_F(DisplaySchedulerTest, OutputSurfaceLost) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId,
- LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(0, base::UnguessableToken::Create()));
SurfaceId sid1(kArbitraryFrameSinkId,
- LocalFrameId(1, base::UnguessableToken::Create()));
+ LocalSurfaceId(1, base::UnguessableToken::Create()));
scheduler_.SetVisible(true);
@@ -301,10 +306,11 @@ TEST_F(DisplaySchedulerTest, OutputSurfaceLost) {
}
TEST_F(DisplaySchedulerTest, VisibleWithoutDamageNoTicks) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId,
- LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(0, base::UnguessableToken::Create()));
SurfaceId sid1(kArbitraryFrameSinkId,
- LocalFrameId(1, base::UnguessableToken::Create()));
+ LocalSurfaceId(1, base::UnguessableToken::Create()));
EXPECT_EQ(0u, fake_begin_frame_source_.num_observers());
scheduler_.SetVisible(true);
@@ -318,10 +324,11 @@ TEST_F(DisplaySchedulerTest, VisibleWithoutDamageNoTicks) {
}
TEST_F(DisplaySchedulerTest, VisibleWithDamageTicks) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId,
- LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(0, base::UnguessableToken::Create()));
SurfaceId sid1(kArbitraryFrameSinkId,
- LocalFrameId(1, base::UnguessableToken::Create()));
+ LocalSurfaceId(1, base::UnguessableToken::Create()));
scheduler_.SetNewRootSurface(root_surface_id);
@@ -334,10 +341,11 @@ TEST_F(DisplaySchedulerTest, VisibleWithDamageTicks) {
}
TEST_F(DisplaySchedulerTest, Visibility) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId,
- LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(0, base::UnguessableToken::Create()));
SurfaceId sid1(kArbitraryFrameSinkId,
- LocalFrameId(1, base::UnguessableToken::Create()));
+ LocalSurfaceId(1, base::UnguessableToken::Create()));
scheduler_.SetNewRootSurface(root_surface_id);
scheduler_.SetVisible(true);
@@ -385,10 +393,11 @@ TEST_F(DisplaySchedulerTest, Visibility) {
}
TEST_F(DisplaySchedulerTest, ResizeCausesSwap) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId,
- LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(0, base::UnguessableToken::Create()));
SurfaceId sid1(kArbitraryFrameSinkId,
- LocalFrameId(1, base::UnguessableToken::Create()));
+ LocalSurfaceId(1, base::UnguessableToken::Create()));
scheduler_.SetVisible(true);
@@ -412,10 +421,11 @@ TEST_F(DisplaySchedulerTest, ResizeCausesSwap) {
}
TEST_F(DisplaySchedulerTest, RootSurfaceResourcesLocked) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId,
- LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(0, base::UnguessableToken::Create()));
SurfaceId sid1(kArbitraryFrameSinkId,
- LocalFrameId(1, base::UnguessableToken::Create()));
+ LocalSurfaceId(1, base::UnguessableToken::Create()));
base::TimeTicks late_deadline;
scheduler_.SetVisible(true);
@@ -462,12 +472,13 @@ TEST_F(DisplaySchedulerTest, RootSurfaceResourcesLocked) {
}
TEST_F(DisplaySchedulerTest, DidSwapBuffers) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId,
- LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(0, base::UnguessableToken::Create()));
SurfaceId sid1(kArbitraryFrameSinkId,
- LocalFrameId(1, base::UnguessableToken::Create()));
+ LocalSurfaceId(1, base::UnguessableToken::Create()));
SurfaceId sid2(kArbitraryFrameSinkId,
- LocalFrameId(2, base::UnguessableToken::Create()));
+ LocalSurfaceId(2, base::UnguessableToken::Create()));
scheduler_.SetVisible(true);
@@ -532,10 +543,11 @@ TEST_F(DisplaySchedulerTest, DidSwapBuffers) {
// 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,
- LocalFrameId(1, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id(
+ kArbitraryFrameSinkId,
+ LocalSurfaceId(1, base::UnguessableToken::Create()));
SurfaceId sid1(kArbitraryFrameSinkId,
- LocalFrameId(2, base::UnguessableToken::Create()));
+ LocalSurfaceId(2, base::UnguessableToken::Create()));
int count = 1;
EXPECT_EQ(count, scheduler_.scheduler_begin_frame_deadline_count());
« no previous file with comments | « cc/surfaces/display.cc ('k') | cc/surfaces/display_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698