| Index: cc/resources/gpu_raster_worker_pool.h
|
| diff --git a/cc/resources/gpu_raster_worker_pool.h b/cc/resources/gpu_raster_worker_pool.h
|
| index 71486c0d94568148fb42d209d4ac389dfd9546dd..6034d3716e86b85a8fcc72e2272e372c70fc9882 100644
|
| --- a/cc/resources/gpu_raster_worker_pool.h
|
| +++ b/cc/resources/gpu_raster_worker_pool.h
|
| @@ -42,8 +42,7 @@ class CC_EXPORT GpuRasterWorkerPool : public RasterWorkerPool,
|
| ContextProvider* context_provider,
|
| ResourceProvider* resource_provider);
|
|
|
| - void OnRasterFinished();
|
| - void OnRasterRequiredForActivationFinished();
|
| + void OnRasterFinished(TaskSet task_set);
|
| void ScheduleRunTasksOnOriginThread();
|
| void RunTasksOnOriginThread();
|
| void RunTaskOnOriginThread(RasterizerTask* task);
|
| @@ -57,11 +56,9 @@ class CC_EXPORT GpuRasterWorkerPool : public RasterWorkerPool,
|
|
|
| bool run_tasks_on_origin_thread_pending_;
|
|
|
| - bool raster_tasks_pending_;
|
| - bool raster_tasks_required_for_activation_pending_;
|
| + TaskSetCollection raster_pending_;
|
|
|
| - scoped_refptr<RasterizerTask> raster_finished_task_;
|
| - scoped_refptr<RasterizerTask> raster_required_for_activation_finished_task_;
|
| + scoped_refptr<RasterizerTask> raster_finished_tasks_[kNumberOfTaskSets];
|
|
|
| // Task graph used when scheduling tasks and vector used to gather
|
| // completed tasks.
|
|
|