| Index: cc/raster/zero_copy_tile_task_worker_pool.h
|
| diff --git a/cc/raster/zero_copy_tile_task_worker_pool.h b/cc/raster/zero_copy_tile_task_worker_pool.h
|
| index b1015593245d12af3d39a272680dee4c32774224..0ebc2e535ef0507d7e13046f1b6db405c2bdf784 100644
|
| --- a/cc/raster/zero_copy_tile_task_worker_pool.h
|
| +++ b/cc/raster/zero_copy_tile_task_worker_pool.h
|
| @@ -35,9 +35,8 @@ class CC_EXPORT ZeroCopyTileTaskWorkerPool : public TileTaskWorkerPool,
|
| TileTaskRunner* AsTileTaskRunner() override;
|
|
|
| // Overridden from TileTaskRunner:
|
| - void SetClient(TileTaskRunnerClient* client) override;
|
| void Shutdown() override;
|
| - void ScheduleTasks(TileTaskQueue* queue) override;
|
| + void ScheduleTasks(scoped_ptr<TaskGraph> graph) override;
|
| void CheckForCompletedTasks() override;
|
| ResourceFormat GetResourceFormat(bool must_support_alpha) const override;
|
| bool GetResourceRequiresSwizzle(bool must_support_alpha) const override;
|
| @@ -56,30 +55,21 @@ class CC_EXPORT ZeroCopyTileTaskWorkerPool : public TileTaskWorkerPool,
|
| bool use_rgba_4444_texture_format);
|
|
|
| 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_;
|
|
|
| bool use_rgba_4444_texture_format_;
|
|
|
| - 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_;
|
| + scoped_ptr<TaskGraph> graph_;
|
| Task::Vector completed_tasks_;
|
|
|
| - base::WeakPtrFactory<ZeroCopyTileTaskWorkerPool>
|
| - task_set_finished_weak_ptr_factory_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ZeroCopyTileTaskWorkerPool);
|
| };
|
|
|
|
|