Index: cc/resources/image_raster_worker_pool.h |
diff --git a/cc/resources/image_raster_worker_pool.h b/cc/resources/image_raster_worker_pool.h |
index b3b8ad80363a1958fa32b8acb2e79cd3582aaed3..a4f55c5699f62f45214446c776dfd608e52bf6e2 100644 |
--- a/cc/resources/image_raster_worker_pool.h |
+++ b/cc/resources/image_raster_worker_pool.h |
@@ -15,11 +15,10 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool { |
static scoped_ptr<RasterWorkerPool> Create( |
ResourceProvider* resource_provider, |
- ContextProvider* context_provider, |
unsigned texture_target); |
// Overridden from RasterWorkerPool: |
- virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE; |
+ virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE; |
virtual unsigned GetResourceTarget() const OVERRIDE; |
virtual ResourceFormat GetResourceFormat() const OVERRIDE; |
virtual void CheckForCompletedTasks() OVERRIDE; |
@@ -30,12 +29,12 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool { |
virtual void OnRasterCompleted(internal::RasterWorkerPoolTask* task, |
const PicturePileImpl::Analysis& analysis) |
OVERRIDE; |
- virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE; |
+ virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE { |
+ } |
protected: |
ImageRasterWorkerPool(internal::TaskGraphRunner* task_graph_runner, |
ResourceProvider* resource_provider, |
- ContextProvider* context_provider, |
unsigned texture_target); |
private: |
@@ -47,7 +46,7 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool { |
const unsigned texture_target_; |
- RasterTask::Queue raster_tasks_; |
+ RasterTaskQueue raster_tasks_; |
bool raster_tasks_pending_; |
bool raster_tasks_required_for_activation_pending_; |