Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(714)

Unified Diff: cc/resources/image_raster_worker_pool.h

Issue 143003012: Revert of cc: Remove WorkerPool class and instead use TaskGraphRunner directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/resources/image_raster_worker_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c9a28b61a9ed8a8e364212746dd86d288cb8626e..3279bd2375da4c015278e07f98ac61af094341b1 100644
--- a/cc/resources/image_raster_worker_pool.h
+++ b/cc/resources/image_raster_worker_pool.h
@@ -16,7 +16,7 @@
static scoped_ptr<RasterWorkerPool> Create(
ResourceProvider* resource_provider,
ContextProvider* context_provider,
- unsigned texture_target) {
+ GLenum texture_target) {
return make_scoped_ptr<RasterWorkerPool>(
new ImageRasterWorkerPool(resource_provider,
context_provider,
@@ -25,7 +25,7 @@
// Overridden from RasterWorkerPool:
virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE;
- virtual unsigned GetResourceTarget() const OVERRIDE;
+ virtual GLenum GetResourceTarget() const OVERRIDE;
virtual ResourceFormat GetResourceFormat() const OVERRIDE;
virtual void OnRasterTasksFinished() OVERRIDE;
virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE;
@@ -33,7 +33,7 @@
private:
ImageRasterWorkerPool(ResourceProvider* resource_provider,
ContextProvider* context_provider,
- unsigned texture_target);
+ GLenum texture_target);
void OnRasterTaskCompleted(
scoped_refptr<internal::RasterWorkerPoolTask> task, bool was_canceled);
@@ -42,14 +42,14 @@
static void CreateGraphNodeForImageTask(
internal::WorkerPoolTask* image_task,
- const internal::Task::Vector& decode_tasks,
+ const TaskVector& 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 unsigned texture_target_;
+ const GLenum texture_target_;
TaskMap image_tasks_;
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/resources/image_raster_worker_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698