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

Unified Diff: ui/compositor/layer_unittest.cc

Issue 2379653006: Replaced cc::SurfaceId::nonce_ with base::UnguessableToken (Closed)
Patch Set: Added static cast to LocalFrameId::hash() to avoid warnings when compiled on Windows 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
Index: ui/compositor/layer_unittest.cc
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index 46a33b3391c7c4ac437c19c475a210c4d398aa23..57577c460a7576ad08316ad0dde282b801a6e78c 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -1852,7 +1852,9 @@ TEST_F(LayerWithDelegateTest, ExternalContentMirroring) {
const auto satisfy_callback = base::Bind(&FakeSatisfyCallback);
const auto require_callback = base::Bind(&FakeRequireCallback);
- cc::SurfaceId surface_id(cc::FrameSinkId(0, 1), cc::LocalFrameId(2, 3));
+ cc::SurfaceId surface_id(
+ cc::FrameSinkId(0, 1),
+ cc::LocalFrameId(2, base::UnguessableToken::Create()));
layer->SetShowSurface(surface_id, satisfy_callback, require_callback,
gfx::Size(10, 10), 1.0f, gfx::Size(10, 10));
@@ -1867,7 +1869,9 @@ TEST_F(LayerWithDelegateTest, ExternalContentMirroring) {
EXPECT_EQ(gfx::Size(10, 10), surface->surface_size());
EXPECT_EQ(1.0f, surface->surface_scale());
- surface_id = cc::SurfaceId(cc::FrameSinkId(1, 2), cc::LocalFrameId(3, 4));
+ surface_id =
+ cc::SurfaceId(cc::FrameSinkId(1, 2),
+ cc::LocalFrameId(3, base::UnguessableToken::Create()));
layer->SetShowSurface(surface_id, satisfy_callback, require_callback,
gfx::Size(20, 20), 2.0f, gfx::Size(20, 20));

Powered by Google App Engine
This is Rietveld 408576698