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

Unified Diff: services/ui/ws/frame_generator_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: services/ui/ws/frame_generator_unittest.cc
diff --git a/services/ui/ws/frame_generator_unittest.cc b/services/ui/ws/frame_generator_unittest.cc
index a561cb0b7fa81faa79de6ec18ed6c9adceedd047..1313dc6f6b65679051e788650f1ba98ba34e96ac 100644
--- a/services/ui/ws/frame_generator_unittest.cc
+++ b/services/ui/ws/frame_generator_unittest.cc
@@ -25,6 +25,7 @@ namespace {
// Typical id for the display root ServerWindow.
constexpr WindowId kRootDisplayId(0, 2);
+const base::UnguessableToken kArbitraryToken = base::UnguessableToken::Create();
// Makes the window visible and creates the default surface for it.
void InitWindow(ServerWindow* window) {
@@ -37,7 +38,7 @@ void InitWindow(ServerWindow* window) {
cc::FrameSinkId(
WindowIdToTransportId(window->id()),
static_cast<uint32_t>(mojom::CompositorFrameSinkType::DEFAULT)),
- cc::LocalFrameId(1u, 1u)),
+ cc::LocalFrameId(1u, kArbitraryToken)),
gfx::Size(100, 100));
}
@@ -131,7 +132,7 @@ TEST_F(FrameGeneratorTest, DrawWindowTree) {
cc::FrameSinkId(
WindowIdToTransportId(child_window.id()),
static_cast<uint32_t>(mojom::CompositorFrameSinkType::UNDERLAY)),
- cc::LocalFrameId(1u, 1u)),
+ cc::LocalFrameId(1u, kArbitraryToken)),
gfx::Size(100, 100));
render_pass = cc::RenderPass::Create();

Powered by Google App Engine
This is Rietveld 408576698