| Index: cc/test/fake_tile_manager.cc
|
| diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc
|
| index 8aa343b7b313b583b825cebc4e9fd72881ce35cd..f85946a1ef8279dd9b9e698e4ed935ea537b637b 100644
|
| --- a/cc/test/fake_tile_manager.cc
|
| +++ b/cc/test/fake_tile_manager.cc
|
| @@ -9,22 +9,20 @@
|
|
|
| #include "base/lazy_instance.h"
|
| #include "cc/resources/raster_buffer.h"
|
| -#include "cc/resources/rasterizer.h"
|
| +#include "cc/resources/tile_task_runner.h"
|
|
|
| namespace cc {
|
|
|
| namespace {
|
|
|
| -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();
|
| @@ -49,7 +47,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;
|
| @@ -59,7 +57,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;
|
|
|
| } // namespace
|
| @@ -68,7 +66,7 @@ FakeTileManager::FakeTileManager(TileManagerClient* client)
|
| : TileManager(client,
|
| base::MessageLoopProxy::current(),
|
| NULL,
|
| - g_fake_rasterizer.Pointer(),
|
| + g_fake_tile_task_runner.Pointer(),
|
| NULL,
|
| std::numeric_limits<size_t>::max()) {
|
| }
|
| @@ -78,7 +76,7 @@ FakeTileManager::FakeTileManager(TileManagerClient* client,
|
| : TileManager(client,
|
| base::MessageLoopProxy::current(),
|
| resource_pool,
|
| - g_fake_rasterizer.Pointer(),
|
| + g_fake_tile_task_runner.Pointer(),
|
| NULL,
|
| std::numeric_limits<size_t>::max()) {
|
| }
|
|
|