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 3279bd2375da4c015278e07f98ac61af094341b1..c9a28b61a9ed8a8e364212746dd86d288cb8626e 100644 |
--- a/cc/resources/image_raster_worker_pool.h |
+++ b/cc/resources/image_raster_worker_pool.h |
@@ -16,7 +16,7 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool { |
static scoped_ptr<RasterWorkerPool> Create( |
ResourceProvider* resource_provider, |
ContextProvider* context_provider, |
- GLenum texture_target) { |
+ unsigned texture_target) { |
return make_scoped_ptr<RasterWorkerPool>( |
new ImageRasterWorkerPool(resource_provider, |
context_provider, |
@@ -25,7 +25,7 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool { |
// Overridden from RasterWorkerPool: |
virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE; |
- virtual GLenum GetResourceTarget() const OVERRIDE; |
+ virtual unsigned GetResourceTarget() const OVERRIDE; |
virtual ResourceFormat GetResourceFormat() const OVERRIDE; |
virtual void OnRasterTasksFinished() OVERRIDE; |
virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE; |
@@ -33,7 +33,7 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool { |
private: |
ImageRasterWorkerPool(ResourceProvider* resource_provider, |
ContextProvider* context_provider, |
- GLenum texture_target); |
+ unsigned texture_target); |
void OnRasterTaskCompleted( |
scoped_refptr<internal::RasterWorkerPoolTask> task, bool was_canceled); |
@@ -42,14 +42,14 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool { |
static void CreateGraphNodeForImageTask( |
internal::WorkerPoolTask* image_task, |
- const TaskVector& decode_tasks, |
+ const internal::Task::Vector& decode_tasks, |
unsigned priority, |
bool is_required_for_activation, |
internal::GraphNode* raster_required_for_activation_finished_node, |
internal::GraphNode* raster_finished_node, |
TaskGraph* graph); |
- const GLenum texture_target_; |
+ const unsigned texture_target_; |
TaskMap image_tasks_; |