Index: cc/surfaces/surface_aggregator_perftest.cc |
diff --git a/cc/surfaces/surface_aggregator_perftest.cc b/cc/surfaces/surface_aggregator_perftest.cc |
index 73f617442caf8cfa32a0b1f483a961ca5487880a..0d990f0ac9263272a20140c2120c0be62acc9a01 100644 |
--- a/cc/surfaces/surface_aggregator_perftest.cc |
+++ b/cc/surfaces/surface_aggregator_perftest.cc |
@@ -22,6 +22,8 @@ namespace cc { |
namespace { |
static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1); |
+static const base::UnguessableToken kArbitraryToken = |
+ base::UnguessableToken::Create(); |
class EmptySurfaceFactoryClient : public SurfaceFactoryClient { |
public: |
@@ -50,7 +52,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, kArbitraryToken); |
factory_.Create(local_frame_id); |
std::unique_ptr<RenderPass> pass(RenderPass::Create()); |
CompositorFrame frame; |
@@ -87,9 +89,9 @@ class SurfaceAggregatorPerfTest : public testing::Test { |
if (i > 1) { |
SurfaceDrawQuad* surface_quad = |
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))); |
+ surface_quad->SetNew(sqs, gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1), |
+ SurfaceId(kArbitraryFrameSinkId, |
+ LocalFrameId(i - 1, kArbitraryToken))); |
} |
frame.render_pass_list.push_back(std::move(pass)); |
@@ -97,7 +99,7 @@ class SurfaceAggregatorPerfTest : public testing::Test { |
SurfaceFactory::DrawCallback()); |
} |
- factory_.Create(LocalFrameId(num_surfaces + 1, 0)); |
+ factory_.Create(LocalFrameId(num_surfaces + 1, kArbitraryToken)); |
timer_.Reset(); |
do { |
std::unique_ptr<RenderPass> pass(RenderPass::Create()); |
@@ -108,7 +110,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, kArbitraryToken))); |
if (full_damage) |
pass->damage_rect = gfx::Rect(0, 0, 100, 100); |
@@ -116,21 +119,22 @@ class SurfaceAggregatorPerfTest : public testing::Test { |
pass->damage_rect = gfx::Rect(0, 0, 1, 1); |
frame.render_pass_list.push_back(std::move(pass)); |
- factory_.SubmitCompositorFrame(LocalFrameId(num_surfaces + 1, 0), |
- std::move(frame), |
- SurfaceFactory::DrawCallback()); |
+ factory_.SubmitCompositorFrame( |
+ LocalFrameId(num_surfaces + 1, kArbitraryToken), std::move(frame), |
+ SurfaceFactory::DrawCallback()); |
CompositorFrame aggregated = aggregator_->Aggregate( |
- SurfaceId(kArbitraryFrameSinkId, LocalFrameId(num_surfaces + 1, 0))); |
+ SurfaceId(kArbitraryFrameSinkId, |
+ LocalFrameId(num_surfaces + 1, kArbitraryToken))); |
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, kArbitraryToken)); |
for (int i = 1; i <= num_surfaces; i++) |
- factory_.Destroy(LocalFrameId(i, 0)); |
+ factory_.Destroy(LocalFrameId(i, kArbitraryToken)); |
} |
protected: |