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

Unified Diff: cc/resources/pixel_buffer_raster_worker_pool.cc

Issue 140333006: cc: Move internal::Task::did_schedule_ to internal::WorkerPoolTask. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix cc_unittests Created 6 years, 10 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 563b1f668ec580da3dd06ede776c001bac7ffb5d..2ef6c83bf78f26dd1e7f1dce04d824c352cb6b1e 100644
--- a/cc/resources/pixel_buffer_raster_worker_pool.cc
+++ b/cc/resources/pixel_buffer_raster_worker_pool.cc
@@ -132,6 +132,7 @@ void PixelBufferRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
raster_task_states_.erase(state_it);
} else {
+ DCHECK(!task->HasBeenScheduled());
new_raster_task_states[task] = UNSCHEDULED;
if (IsRasterTaskRequiredForActivation(task))
raster_tasks_required_for_activation_.insert(task);
@@ -149,6 +150,7 @@ void PixelBufferRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
// Unscheduled task can be canceled.
if (it->second == UNSCHEDULED) {
+ DCHECK(!task->HasBeenScheduled());
DCHECK(std::find(completed_raster_tasks_.begin(),
completed_raster_tasks_.end(),
task) == completed_raster_tasks_.end());
@@ -525,6 +527,7 @@ void PixelBufferRasterWorkerPool::ScheduleMoreTasks() {
// If raster has finished, just update |bytes_pending_upload|.
if (state_it->second == UPLOADING) {
+ DCHECK(task->HasCompleted());
bytes_pending_upload = new_bytes_pending_upload;
continue;
}
@@ -546,7 +549,6 @@ void PixelBufferRasterWorkerPool::ScheduleMoreTasks() {
? REQUIRED_FOR_ACTIVATION_TYPE
: PREPAINT_TYPE;
- task->ScheduleOnOriginThread(this);
DCHECK(state_it->second == UNSCHEDULED || state_it->second == SCHEDULED);
state_it->second = SCHEDULED;
« 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