| Index: cc/raster/bitmap_tile_task_worker_pool.h
|
| diff --git a/cc/raster/bitmap_tile_task_worker_pool.h b/cc/raster/bitmap_tile_task_worker_pool.h
|
| index fe9c4e81087f6d5982b1ef069882d6943cfda84e..f53768f11ba90e6649eee5bcb7329920d7733417 100644
|
| --- a/cc/raster/bitmap_tile_task_worker_pool.h
|
| +++ b/cc/raster/bitmap_tile_task_worker_pool.h
|
| @@ -5,7 +5,6 @@
|
| #ifndef CC_RASTER_BITMAP_TILE_TASK_WORKER_POOL_H_
|
| #define CC_RASTER_BITMAP_TILE_TASK_WORKER_POOL_H_
|
|
|
| -#include "base/memory/weak_ptr.h"
|
| #include "base/values.h"
|
| #include "cc/raster/tile_task_runner.h"
|
| #include "cc/raster/tile_task_worker_pool.h"
|
| @@ -34,9 +33,8 @@ class CC_EXPORT BitmapTileTaskWorkerPool : public TileTaskWorkerPool,
|
| TileTaskRunner* AsTileTaskRunner() override;
|
|
|
| // Overridden from TileTaskRunner:
|
| - void SetClient(TileTaskRunnerClient* client) override;
|
| void Shutdown() override;
|
| - void ScheduleTasks(TileTaskQueue* queue) override;
|
| + void ScheduleTasks(TaskGraph* graph) override;
|
| void CheckForCompletedTasks() override;
|
| ResourceFormat GetResourceFormat(bool must_support_alpha) const override;
|
| bool GetResourceRequiresSwizzle(bool must_support_alpha) const override;
|
| @@ -54,28 +52,16 @@ class CC_EXPORT BitmapTileTaskWorkerPool : public TileTaskWorkerPool,
|
| ResourceProvider* resource_provider);
|
|
|
| private:
|
| - void OnTaskSetFinished(TaskSet task_set);
|
| scoped_refptr<base::trace_event::ConvertableToTraceFormat> StateAsValue()
|
| const;
|
|
|
| scoped_refptr<base::SequencedTaskRunner> task_runner_;
|
| TaskGraphRunner* task_graph_runner_;
|
| const NamespaceToken namespace_token_;
|
| - TileTaskRunnerClient* client_;
|
| ResourceProvider* resource_provider_;
|
|
|
| - TaskSetCollection tasks_pending_;
|
| -
|
| - scoped_refptr<TileTask> task_set_finished_tasks_[kNumberOfTaskSets];
|
| -
|
| - // Task graph used when scheduling tasks and vector used to gather
|
| - // completed tasks.
|
| - TaskGraph graph_;
|
| Task::Vector completed_tasks_;
|
|
|
| - base::WeakPtrFactory<BitmapTileTaskWorkerPool>
|
| - task_set_finished_weak_ptr_factory_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(BitmapTileTaskWorkerPool);
|
| };
|
|
|
|
|