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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/surfaces/display_scheduler_unittest.cc

Issue 2379653006: Replaced cc::SurfaceId::nonce_ with base::UnguessableToken (Closed)
Patch Set: Changed SurfaceManager::kRootSurfaceId to a private field to avoid static initialization Created 4 years, 1 month 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/quads/draw_quad_unittest.cc ('k') | cc/surfaces/local_frame_id.h » ('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 1a5cbe4086b9d4581bf2a44ce75a03d88ef9ebe4..ea7a22fba5a84d9bf54d197f19a0911a4101c81e 100644
--- a/cc/surfaces/display_scheduler_unittest.cc
+++ b/cc/surfaces/display_scheduler_unittest.cc
@@ -106,9 +106,12 @@ class DisplaySchedulerTest : public testing::Test {
};
TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
- SurfaceId root_surface_id1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
- SurfaceId root_surface_id2(kArbitraryFrameSinkId, LocalFrameId(2, 0));
- SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(3, 0));
+ SurfaceId root_surface_id1(kArbitraryFrameSinkId,
+ LocalFrameId(1, base::UnguessableToken::Create()));
+ SurfaceId root_surface_id2(kArbitraryFrameSinkId,
+ LocalFrameId(2, base::UnguessableToken::Create()));
+ SurfaceId sid1(kArbitraryFrameSinkId,
+ LocalFrameId(3, base::UnguessableToken::Create()));
base::TimeTicks late_deadline;
scheduler_.SetVisible(true);
@@ -143,8 +146,10 @@ TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
}
TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilDamagedSurface) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(1, 0));
- SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(2, 0));
+ SurfaceId root_surface_id(kArbitraryFrameSinkId,
+ LocalFrameId(1, base::UnguessableToken::Create()));
+ SurfaceId sid1(kArbitraryFrameSinkId,
+ LocalFrameId(2, base::UnguessableToken::Create()));
base::TimeTicks late_deadline;
scheduler_.SetVisible(true);
@@ -179,9 +184,12 @@ TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilDamagedSurface) {
}
TEST_F(DisplaySchedulerTest, SurfaceDamaged) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
- SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
- SurfaceId sid2(kArbitraryFrameSinkId, LocalFrameId(2, 0));
+ SurfaceId root_surface_id(kArbitraryFrameSinkId,
+ LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId sid1(kArbitraryFrameSinkId,
+ LocalFrameId(1, base::UnguessableToken::Create()));
+ SurfaceId sid2(kArbitraryFrameSinkId,
+ LocalFrameId(2, base::UnguessableToken::Create()));
scheduler_.SetVisible(true);
@@ -245,8 +253,10 @@ TEST_F(DisplaySchedulerTest, SurfaceDamaged) {
}
TEST_F(DisplaySchedulerTest, OutputSurfaceLost) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
- SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
+ SurfaceId root_surface_id(kArbitraryFrameSinkId,
+ LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId sid1(kArbitraryFrameSinkId,
+ LocalFrameId(1, base::UnguessableToken::Create()));
scheduler_.SetVisible(true);
@@ -278,8 +288,10 @@ TEST_F(DisplaySchedulerTest, OutputSurfaceLost) {
}
TEST_F(DisplaySchedulerTest, VisibleWithoutDamageNoTicks) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
- SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
+ SurfaceId root_surface_id(kArbitraryFrameSinkId,
+ LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId sid1(kArbitraryFrameSinkId,
+ LocalFrameId(1, base::UnguessableToken::Create()));
EXPECT_EQ(0u, fake_begin_frame_source_.num_observers());
scheduler_.SetVisible(true);
@@ -293,8 +305,10 @@ TEST_F(DisplaySchedulerTest, VisibleWithoutDamageNoTicks) {
}
TEST_F(DisplaySchedulerTest, VisibleWithDamageTicks) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
- SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
+ SurfaceId root_surface_id(kArbitraryFrameSinkId,
+ LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId sid1(kArbitraryFrameSinkId,
+ LocalFrameId(1, base::UnguessableToken::Create()));
scheduler_.SetNewRootSurface(root_surface_id);
@@ -307,8 +321,10 @@ TEST_F(DisplaySchedulerTest, VisibleWithDamageTicks) {
}
TEST_F(DisplaySchedulerTest, Visibility) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
- SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
+ SurfaceId root_surface_id(kArbitraryFrameSinkId,
+ LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId sid1(kArbitraryFrameSinkId,
+ LocalFrameId(1, base::UnguessableToken::Create()));
scheduler_.SetNewRootSurface(root_surface_id);
scheduler_.SetVisible(true);
@@ -356,8 +372,10 @@ TEST_F(DisplaySchedulerTest, Visibility) {
}
TEST_F(DisplaySchedulerTest, ResizeCausesSwap) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
- SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
+ SurfaceId root_surface_id(kArbitraryFrameSinkId,
+ LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId sid1(kArbitraryFrameSinkId,
+ LocalFrameId(1, base::UnguessableToken::Create()));
scheduler_.SetVisible(true);
@@ -381,8 +399,10 @@ TEST_F(DisplaySchedulerTest, ResizeCausesSwap) {
}
TEST_F(DisplaySchedulerTest, RootSurfaceResourcesLocked) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
- SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
+ SurfaceId root_surface_id(kArbitraryFrameSinkId,
+ LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId sid1(kArbitraryFrameSinkId,
+ LocalFrameId(1, base::UnguessableToken::Create()));
base::TimeTicks late_deadline;
scheduler_.SetVisible(true);
@@ -429,9 +449,12 @@ TEST_F(DisplaySchedulerTest, RootSurfaceResourcesLocked) {
}
TEST_F(DisplaySchedulerTest, DidSwapBuffers) {
- SurfaceId root_surface_id(kArbitraryFrameSinkId, LocalFrameId(0, 0));
- SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(1, 0));
- SurfaceId sid2(kArbitraryFrameSinkId, LocalFrameId(2, 0));
+ SurfaceId root_surface_id(kArbitraryFrameSinkId,
+ LocalFrameId(0, base::UnguessableToken::Create()));
+ SurfaceId sid1(kArbitraryFrameSinkId,
+ LocalFrameId(1, base::UnguessableToken::Create()));
+ SurfaceId sid2(kArbitraryFrameSinkId,
+ LocalFrameId(2, base::UnguessableToken::Create()));
scheduler_.SetVisible(true);
@@ -496,8 +519,10 @@ 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, 0));
- SurfaceId sid1(kArbitraryFrameSinkId, LocalFrameId(2, 0));
+ SurfaceId root_surface_id(kArbitraryFrameSinkId,
+ LocalFrameId(1, base::UnguessableToken::Create()));
+ SurfaceId sid1(kArbitraryFrameSinkId,
+ LocalFrameId(2, base::UnguessableToken::Create()));
int count = 1;
EXPECT_EQ(count, scheduler_.scheduler_begin_frame_deadline_count());
« no previous file with comments | « cc/quads/draw_quad_unittest.cc ('k') | cc/surfaces/local_frame_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698