Index: cc/resources/image_copy_raster_worker_pool.h |
diff --git a/cc/resources/image_copy_raster_worker_pool.h b/cc/resources/image_copy_raster_worker_pool.h |
index faa3f1aa7dff4490100a69c753edca0ce7998c33..ea8191e7f71ab4cbd556b8d59c4133e260edaeb2 100644 |
--- a/cc/resources/image_copy_raster_worker_pool.h |
+++ b/cc/resources/image_copy_raster_worker_pool.h |
@@ -82,7 +82,7 @@ class CC_EXPORT ImageCopyRasterWorkerPool : public RasterWorkerPool, |
}; |
void OnRasterFinished(); |
- void OnRasterRequiredForActivationFinished(); |
+ void OnRasterTaskSetFinished(TaskSet task_set); |
void FlushCopies(); |
scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const; |
void StagingStateAsValueInto(base::debug::TracedValue* staging_state) const; |
@@ -100,10 +100,10 @@ class CC_EXPORT ImageCopyRasterWorkerPool : public RasterWorkerPool, |
bool has_performed_copy_since_last_flush_; |
bool raster_tasks_pending_; |
- bool raster_tasks_required_for_activation_pending_; |
+ RasterTaskQueue::Item::TaskSetCollection raster_task_sets_pending_; |
scoped_refptr<RasterizerTask> raster_finished_task_; |
- scoped_refptr<RasterizerTask> raster_required_for_activation_finished_task_; |
+ std::vector<scoped_refptr<RasterizerTask> > task_set_finished_tasks_; |
reveman
2014/09/05 08:38:59
array
ernstm
2014/09/05 21:36:10
Done.
|
// Task graph used when scheduling tasks and vector used to gather |
// completed tasks. |