| Index: cc/resources/tile_manager_perftest.cc
|
| diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc
|
| index 2204ab808d17f2a793a7f615488811d7253500a3..29e174d75fbd49a8495b265a13ff0cc36e839849 100644
|
| --- a/cc/resources/tile_manager_perftest.cc
|
| +++ b/cc/resources/tile_manager_perftest.cc
|
| @@ -34,16 +34,14 @@ static const int kTimeLimitMillis = 2000;
|
| static const int kWarmupRuns = 5;
|
| static const int kTimeCheckInterval = 10;
|
|
|
| -class FakeRasterizerImpl : public Rasterizer, public RasterizerTaskClient {
|
| +class FakeTileTaskRunnerImpl : public TileTaskRunner, public TileTaskClient {
|
| public:
|
| - // Overridden from Rasterizer:
|
| - void SetClient(RasterizerClient* client) override {}
|
| + // Overridden from TileTaskRunner:
|
| + void SetClient(TileTaskRunnerClient* client) override {}
|
| void Shutdown() override {}
|
| - void ScheduleTasks(RasterTaskQueue* queue) override {
|
| - for (RasterTaskQueue::Item::Vector::const_iterator it =
|
| - queue->items.begin();
|
| - it != queue->items.end();
|
| - ++it) {
|
| + void ScheduleTasks(TileTaskQueue* queue) override {
|
| + for (TileTaskQueue::Item::Vector::const_iterator it = queue->items.begin();
|
| + it != queue->items.end(); ++it) {
|
| RasterTask* task = it->task;
|
|
|
| task->WillSchedule();
|
| @@ -68,7 +66,7 @@ class FakeRasterizerImpl : public Rasterizer, public RasterizerTaskClient {
|
| completed_tasks_.clear();
|
| }
|
|
|
| - // Overridden from RasterizerTaskClient:
|
| + // Overridden from TileTaskClient:
|
| scoped_ptr<RasterBuffer> AcquireBufferForRaster(
|
| const Resource* resource) override {
|
| return nullptr;
|
| @@ -78,7 +76,7 @@ class FakeRasterizerImpl : public Rasterizer, public RasterizerTaskClient {
|
| private:
|
| RasterTask::Vector completed_tasks_;
|
| };
|
| -base::LazyInstance<FakeRasterizerImpl> g_fake_rasterizer =
|
| +base::LazyInstance<FakeTileTaskRunnerImpl> g_fake_tile_task_runner =
|
| LAZY_INSTANCE_INITIALIZER;
|
|
|
| class TileManagerPerfTest : public testing::Test {
|
| @@ -118,7 +116,8 @@ class TileManagerPerfTest : public testing::Test {
|
|
|
| virtual void InitializeRenderer() {
|
| host_impl_.InitializeRenderer(FakeOutputSurface::Create3d().Pass());
|
| - tile_manager()->SetRasterizerForTesting(g_fake_rasterizer.Pointer());
|
| + tile_manager()->SetTileTaskRunnerForTesting(
|
| + g_fake_tile_task_runner.Pointer());
|
| }
|
|
|
| void SetupDefaultTrees(const gfx::Size& layer_bounds) {
|
|
|