Index: cc/resources/raster_worker_pool.h |
diff --git a/cc/resources/raster_worker_pool.h b/cc/resources/raster_worker_pool.h |
index fac2fd845ce81db11136a986f0437db89f6e8867..54ce8431956e9f7f8002ca24a48dc294e1f514d7 100644 |
--- a/cc/resources/raster_worker_pool.h |
+++ b/cc/resources/raster_worker_pool.h |
@@ -36,6 +36,8 @@ class CC_EXPORT RasterWorkerPoolTask |
void* buffer, |
gfx::Size size, |
int stride) = 0; |
+ virtual void RunOnOriginThread(ResourceProvider* resource_provider, |
+ ContextProvider* context_provider) = 0; |
virtual void CompleteOnOriginThread() = 0; |
void DidRun(bool was_canceled); |
@@ -47,11 +49,14 @@ class CC_EXPORT RasterWorkerPoolTask |
const Resource* resource() const { return resource_; } |
const TaskVector& dependencies() const { return dependencies_; } |
+ bool use_gpu_rasterization() const { return use_gpu_rasterization_; } |
protected: |
friend class base::RefCounted<RasterWorkerPoolTask>; |
- RasterWorkerPoolTask(const Resource* resource, TaskVector* dependencies); |
+ RasterWorkerPoolTask(const Resource* resource, |
+ TaskVector* dependencies, |
+ bool use_gpu_rasterization); |
virtual ~RasterWorkerPoolTask(); |
private: |
@@ -60,6 +65,7 @@ class CC_EXPORT RasterWorkerPoolTask |
bool was_canceled_; |
const Resource* resource_; |
TaskVector dependencies_; |
+ bool use_gpu_rasterization_; |
}; |
} // namespace internal |
@@ -171,8 +177,7 @@ class CC_EXPORT RasterWorkerPool : public WorkerPool { |
void SetClient(RasterWorkerPoolClient* client); |
- // Tells the worker pool to shutdown after canceling all previously |
- // scheduled tasks. Reply callbacks are still guaranteed to run. |
+ // Overidden from WorkerPool: |
virtual void Shutdown() OVERRIDE; |
// Schedule running of raster tasks in |queue| and all dependencies. |
@@ -188,6 +193,10 @@ class CC_EXPORT RasterWorkerPool : public WorkerPool { |
// Returns the format that needs to be used for raster task resources. |
virtual ResourceFormat GetResourceFormat() const = 0; |
+ // Force a check for completed raster tasks. |
+ // Calls completion callbacks on completed tasks. |
+ virtual void CheckForCompletedTasks(); |
+ |
// TODO(vmpstr): Figure out an elegant way to not pass this many parameters. |
static RasterTask CreateRasterTask( |
const Resource* resource, |
@@ -199,6 +208,7 @@ class CC_EXPORT RasterWorkerPool : public WorkerPool { |
int layer_id, |
const void* tile_id, |
int source_frame_number, |
+ bool use_gpu_rasterization, |
RenderingStatsInstrumentation* rendering_stats, |
const RasterTask::Reply& reply, |
Task::Set* dependencies); |
@@ -218,7 +228,9 @@ class CC_EXPORT RasterWorkerPool : public WorkerPool { |
typedef base::hash_map<TaskMapKey, |
scoped_refptr<internal::WorkerPoolTask> > TaskMap; |
- RasterWorkerPool(ResourceProvider* resource_provider, size_t num_threads); |
+ RasterWorkerPool(ResourceProvider* resource_provider, |
+ ContextProvider* context_provider, |
+ size_t num_threads); |
virtual void OnRasterTasksFinished() = 0; |
virtual void OnRasterTasksRequiredForActivationFinished() = 0; |
@@ -226,9 +238,12 @@ class CC_EXPORT RasterWorkerPool : public WorkerPool { |
void SetRasterTasks(RasterTask::Queue* queue); |
bool IsRasterTaskRequiredForActivation( |
internal::RasterWorkerPoolTask* task) const; |
+ // Run raster tasks that use GPU on current thread. |
+ void RunGpuRasterTasks(const RasterTaskVector& tasks); |
RasterWorkerPoolClient* client() const { return client_; } |
ResourceProvider* resource_provider() const { return resource_provider_; } |
+ ContextProvider* context_provider() const { return context_provider_; } |
const RasterTaskVector& raster_tasks() const { return raster_tasks_; } |
const RasterTaskSet& raster_tasks_required_for_activation() const { |
return raster_tasks_required_for_activation_; |
@@ -268,8 +283,10 @@ class CC_EXPORT RasterWorkerPool : public WorkerPool { |
RasterWorkerPoolClient* client_; |
ResourceProvider* resource_provider_; |
+ ContextProvider* context_provider_; |
RasterTask::Queue::TaskVector raster_tasks_; |
RasterTask::Queue::TaskSet raster_tasks_required_for_activation_; |
+ RasterTaskVector completed_gpu_raster_tasks_; |
scoped_refptr<internal::WorkerPoolTask> raster_finished_task_; |
scoped_refptr<internal::WorkerPoolTask> |