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

Unified Diff: cc/resources/pixel_buffer_raster_worker_pool.cc

Issue 141163019: Re-land: cc: Remove WorkerPool class and instead use TaskGraphRunner directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fix 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
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 33eaf34d1d0d91301c6e3af63ed3237653768df2..e32176bf7b0e7d8a679f6c3d3a42e90cc07e5d78 100644
--- a/cc/resources/pixel_buffer_raster_worker_pool.cc
+++ b/cc/resources/pixel_buffer_raster_worker_pool.cc
@@ -32,7 +32,7 @@ class PixelBufferWorkerPoolTaskImpl : public internal::WorkerPoolTask {
needs_upload_(false) {
}
- // Overridden from internal::WorkerPoolTask:
+ // Overridden from internal::Task:
virtual void RunOnWorkerThread(unsigned thread_index) OVERRIDE {
// |buffer_| can be NULL in lost context situations.
if (!buffer_) {
@@ -46,6 +46,8 @@ class PixelBufferWorkerPoolTaskImpl : public internal::WorkerPoolTask {
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_);
@@ -118,7 +120,8 @@ PixelBufferRasterWorkerPool::~PixelBufferRasterWorkerPool() {
void PixelBufferRasterWorkerPool::Shutdown() {
shutdown_ = true;
RasterWorkerPool::Shutdown();
- CheckForCompletedWorkerTasks();
+
+ CheckForCompletedWorkerPoolTasks();
CheckForCompletedUploads();
check_for_completed_raster_tasks_callback_.Cancel();
check_for_completed_raster_tasks_pending_ = false;
@@ -207,7 +210,7 @@ void PixelBufferRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
// 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.
- CheckForCompletedWorkerTasks();
+ CheckForCompletedWorkerPoolTasks();
CheckForCompletedUploads();
FlushUploads();
@@ -227,7 +230,7 @@ void PixelBufferRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
"state", TracedValue::FromValue(StateAsValue().release()));
}
-GLenum PixelBufferRasterWorkerPool::GetResourceTarget() const {
+unsigned PixelBufferRasterWorkerPool::GetResourceTarget() const {
return GL_TEXTURE_2D;
}
@@ -391,7 +394,7 @@ void PixelBufferRasterWorkerPool::CheckForCompletedRasterTasks() {
check_for_completed_raster_tasks_callback_.Cancel();
check_for_completed_raster_tasks_pending_ = false;
- CheckForCompletedWorkerTasks();
+ CheckForCompletedWorkerPoolTasks();
CheckForCompletedUploads();
FlushUploads();

Powered by Google App Engine
This is Rietveld 408576698