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

Unified Diff: cc/resources/pixel_buffer_raster_worker_pool.cc

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/resources/pixel_buffer_raster_worker_pool.h ('k') | cc/resources/raster_worker_pool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/pixel_buffer_raster_worker_pool.cc
diff --git a/cc/resources/pixel_buffer_raster_worker_pool.cc b/cc/resources/pixel_buffer_raster_worker_pool.cc
index e32176bf7b0e7d8a679f6c3d3a42e90cc07e5d78..33eaf34d1d0d91301c6e3af63ed3237653768df2 100644
--- a/cc/resources/pixel_buffer_raster_worker_pool.cc
+++ b/cc/resources/pixel_buffer_raster_worker_pool.cc
@@ -32,7 +32,7 @@
needs_upload_(false) {
}
- // Overridden from internal::Task:
+ // Overridden from internal::WorkerPoolTask:
virtual void RunOnWorkerThread(unsigned thread_index) OVERRIDE {
// |buffer_| can be NULL in lost context situations.
if (!buffer_) {
@@ -46,8 +46,6 @@
task_->resource()->size(),
0);
}
-
- // Overridden from internal::WorkerPoolTask:
virtual void CompleteOnOriginThread() OVERRIDE {
// |needs_upload_| must be be false if task didn't run.
DCHECK(HasFinishedRunning() || !needs_upload_);
@@ -120,8 +118,7 @@
void PixelBufferRasterWorkerPool::Shutdown() {
shutdown_ = true;
RasterWorkerPool::Shutdown();
-
- CheckForCompletedWorkerPoolTasks();
+ CheckForCompletedWorkerTasks();
CheckForCompletedUploads();
check_for_completed_raster_tasks_callback_.Cancel();
check_for_completed_raster_tasks_pending_ = false;
@@ -210,7 +207,7 @@
// Check for completed tasks when ScheduleTasks() is called as
// priorities might have changed and this maximizes the number
// of top priority tasks that are scheduled.
- CheckForCompletedWorkerPoolTasks();
+ CheckForCompletedWorkerTasks();
CheckForCompletedUploads();
FlushUploads();
@@ -230,7 +227,7 @@
"state", TracedValue::FromValue(StateAsValue().release()));
}
-unsigned PixelBufferRasterWorkerPool::GetResourceTarget() const {
+GLenum PixelBufferRasterWorkerPool::GetResourceTarget() const {
return GL_TEXTURE_2D;
}
@@ -394,7 +391,7 @@
check_for_completed_raster_tasks_callback_.Cancel();
check_for_completed_raster_tasks_pending_ = false;
- CheckForCompletedWorkerPoolTasks();
+ CheckForCompletedWorkerTasks();
CheckForCompletedUploads();
FlushUploads();
« no previous file with comments | « cc/resources/pixel_buffer_raster_worker_pool.h ('k') | cc/resources/raster_worker_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698