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 61c8e553e15e0ebe35da23386f39b8b3be639d63..0779eaadf7f07c87e08f7a532ebaea770f0777aa 100644 |
--- a/cc/resources/gpu_raster_worker_pool.h |
+++ b/cc/resources/gpu_raster_worker_pool.h |
@@ -5,6 +5,8 @@ |
#ifndef CC_RESOURCES_GPU_RASTER_WORKER_POOL_H_ |
#define CC_RESOURCES_GPU_RASTER_WORKER_POOL_H_ |
+#include <vector> |
reveman
2014/09/10 16:41:50
Don't need this.
ernstm
2014/09/10 18:26:19
Done.
|
+ |
#include "base/memory/weak_ptr.h" |
#include "cc/resources/raster_worker_pool.h" |
#include "cc/resources/rasterizer.h" |
@@ -42,8 +44,7 @@ class CC_EXPORT GpuRasterWorkerPool : public RasterWorkerPool, |
ContextProvider* context_provider, |
ResourceProvider* resource_provider); |
- void OnRasterFinished(); |
- void OnRasterRequiredForActivationFinished(); |
+ void OnRasterTaskSetFinished(TaskSet task_set); |
reveman
2014/09/10 16:41:49
how about just OnRasterFinished(TaskSet task_set)
ernstm
2014/09/10 18:26:19
Done.
|
void ScheduleRunTasksOnOriginThread(); |
void RunTasksOnOriginThread(); |
void RunTaskOnOriginThread(RasterizerTask* task); |
@@ -57,13 +58,11 @@ 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_task_sets_pending_; |
reveman
2014/09/10 16:41:50
raster_tasks_pending_ or simply raster_pending_? T
ernstm
2014/09/10 18:26:19
Done.
|
base::WeakPtrFactory<GpuRasterWorkerPool> raster_finished_weak_ptr_factory_; |
- scoped_refptr<RasterizerTask> raster_finished_task_; |
- scoped_refptr<RasterizerTask> raster_required_for_activation_finished_task_; |
+ scoped_refptr<RasterizerTask> task_set_finished_tasks_[kNumberOfTaskSets]; |
reveman
2014/09/10 16:41:49
and you could use raster_finished_tasks_ here.
ernstm
2014/09/10 18:26:19
Done.
|
// Task graph used when scheduling tasks and vector used to gather |
// completed tasks. |