Index: cc/surfaces/surface_aggregator_perftest.cc |
diff --git a/cc/surfaces/surface_aggregator_perftest.cc b/cc/surfaces/surface_aggregator_perftest.cc |
index 828518d732562355153294e514872dd7fa5fdbf4..e3b1453447d3a6151dd28c859047be86234ed616 100644 |
--- a/cc/surfaces/surface_aggregator_perftest.cc |
+++ b/cc/surfaces/surface_aggregator_perftest.cc |
@@ -51,7 +51,7 @@ class SurfaceAggregatorPerfTest : public testing::Test { |
aggregator_.reset(new SurfaceAggregator(&manager_, resource_provider_.get(), |
optimize_damage)); |
for (int i = 1; i <= num_surfaces; i++) { |
- LocalFrameId local_frame_id(i, 0); |
+ LocalFrameId local_frame_id(i, base::UnguessableToken()); |
Fady Samuel
2016/10/18 03:56:09
Let's avoid using the default constructor.
Alex Z.
2016/11/02 17:10:20
Done.
|
factory_.Create(local_frame_id); |
std::unique_ptr<RenderPass> pass(RenderPass::Create()); |
std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); |
@@ -90,7 +90,8 @@ class SurfaceAggregatorPerfTest : public testing::Test { |
pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); |
surface_quad->SetNew( |
sqs, gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1), |
- SurfaceId(kArbitraryFrameSinkId, LocalFrameId(i - 1, 0))); |
+ SurfaceId(kArbitraryFrameSinkId, |
+ LocalFrameId(i - 1, base::UnguessableToken()))); |
} |
frame_data->render_pass_list.push_back(std::move(pass)); |
@@ -100,7 +101,7 @@ class SurfaceAggregatorPerfTest : public testing::Test { |
SurfaceFactory::DrawCallback()); |
} |
- factory_.Create(LocalFrameId(num_surfaces + 1, 0)); |
+ factory_.Create(LocalFrameId(num_surfaces + 1, base::UnguessableToken())); |
timer_.Reset(); |
do { |
std::unique_ptr<RenderPass> pass(RenderPass::Create()); |
@@ -111,7 +112,8 @@ class SurfaceAggregatorPerfTest : public testing::Test { |
pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); |
surface_quad->SetNew( |
sqs, gfx::Rect(0, 0, 100, 100), gfx::Rect(0, 0, 100, 100), |
- SurfaceId(kArbitraryFrameSinkId, LocalFrameId(num_surfaces, 0))); |
+ SurfaceId(kArbitraryFrameSinkId, |
+ LocalFrameId(num_surfaces, base::UnguessableToken()))); |
if (full_damage) |
pass->damage_rect = gfx::Rect(0, 0, 100, 100); |
@@ -121,21 +123,22 @@ class SurfaceAggregatorPerfTest : public testing::Test { |
frame_data->render_pass_list.push_back(std::move(pass)); |
CompositorFrame frame; |
frame.delegated_frame_data = std::move(frame_data); |
- factory_.SubmitCompositorFrame(LocalFrameId(num_surfaces + 1, 0), |
- std::move(frame), |
- SurfaceFactory::DrawCallback()); |
+ factory_.SubmitCompositorFrame( |
+ LocalFrameId(num_surfaces + 1, base::UnguessableToken()), |
+ std::move(frame), SurfaceFactory::DrawCallback()); |
CompositorFrame aggregated = aggregator_->Aggregate( |
- SurfaceId(kArbitraryFrameSinkId, LocalFrameId(num_surfaces + 1, 0))); |
+ SurfaceId(kArbitraryFrameSinkId, |
+ LocalFrameId(num_surfaces + 1, base::UnguessableToken()))); |
timer_.NextLap(); |
} while (!timer_.HasTimeLimitExpired()); |
perf_test::PrintResult("aggregator_speed", "", name, timer_.LapsPerSecond(), |
"runs/s", true); |
- factory_.Destroy(LocalFrameId(num_surfaces + 1, 0)); |
+ factory_.Destroy(LocalFrameId(num_surfaces + 1, base::UnguessableToken())); |
for (int i = 1; i <= num_surfaces; i++) |
- factory_.Destroy(LocalFrameId(i, 0)); |
+ factory_.Destroy(LocalFrameId(i, base::UnguessableToken())); |
} |
protected: |