| Index: cc/raster/gpu_tile_task_worker_pool.h
|
| diff --git a/cc/raster/gpu_tile_task_worker_pool.h b/cc/raster/gpu_tile_task_worker_pool.h
|
| index f9ab24c6feafc9d243c4a2c469b906743485a566..20ac14c0af59073714e23ea9765b18af3c0042bf 100644
|
| --- a/cc/raster/gpu_tile_task_worker_pool.h
|
| +++ b/cc/raster/gpu_tile_task_worker_pool.h
|
| @@ -5,7 +5,6 @@
|
| #ifndef CC_RASTER_GPU_TILE_TASK_WORKER_POOL_H_
|
| #define CC_RASTER_GPU_TILE_TASK_WORKER_POOL_H_
|
|
|
| -#include "base/memory/weak_ptr.h"
|
| #include "cc/raster/tile_task_runner.h"
|
| #include "cc/raster/tile_task_worker_pool.h"
|
|
|
| @@ -32,9 +31,8 @@ class CC_EXPORT GpuTileTaskWorkerPool : 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,29 +52,15 @@ class CC_EXPORT GpuTileTaskWorkerPool : public TileTaskWorkerPool,
|
| bool use_distance_field_text,
|
| int gpu_rasterization_msaa_sample_count);
|
|
|
| - void OnTaskSetFinished(TaskSet task_set);
|
| void CompleteTasks(const Task::Vector& tasks);
|
|
|
| scoped_refptr<base::SequencedTaskRunner> task_runner_;
|
| TaskGraphRunner* task_graph_runner_;
|
| const NamespaceToken namespace_token_;
|
| - TileTaskRunnerClient* client_;
|
| scoped_ptr<GpuRasterizer> rasterizer_;
|
|
|
| - 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<GpuTileTaskWorkerPool>
|
| - task_set_finished_weak_ptr_factory_;
|
| -
|
| - base::WeakPtrFactory<GpuTileTaskWorkerPool> weak_ptr_factory_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(GpuTileTaskWorkerPool);
|
| };
|
|
|
|
|