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

Unified Diff: cc/resources/image_raster_worker_pool.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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/base/worker_pool.cc ('k') | cc/resources/pixel_buffer_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.cc
diff --git a/cc/resources/image_raster_worker_pool.cc b/cc/resources/image_raster_worker_pool.cc
index 5800ce1f8c0cb3c0d92428140c19eed475a30a70..c3b8ed89dee8a130df2f96104e10897d5cfe80d1 100644
--- a/cc/resources/image_raster_worker_pool.cc
+++ b/cc/resources/image_raster_worker_pool.cc
@@ -81,11 +81,11 @@ void ImageRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
for (RasterTask::Queue::TaskVector::const_iterator it =
raster_tasks().begin();
it != raster_tasks().end(); ++it) {
- internal::RasterWorkerPoolTask* task = *it;
+ internal::RasterWorkerPoolTask* task = it->get();
TaskMap::iterator image_it = image_tasks_.find(task);
if (image_it != image_tasks_.end()) {
- internal::WorkerPoolTask* image_task = image_it->second;
+ internal::WorkerPoolTask* image_task = image_it->second.get();
tasks.push_back(image_task);
continue;
}
@@ -128,7 +128,7 @@ void ImageRasterWorkerPool::OnRasterTaskCompleted(
TRACE_EVENT1("cc", "ImageRasterWorkerPool::OnRasterTaskCompleted",
"was_canceled", was_canceled);
- DCHECK(image_tasks_.find(task) != image_tasks_.end());
+ DCHECK(image_tasks_.find(task.get()) != image_tasks_.end());
// Balanced with MapImage() call in ScheduleTasks().
resource_provider()->UnmapImage(task->resource()->id());
@@ -142,7 +142,7 @@ void ImageRasterWorkerPool::OnRasterTaskCompleted(
task->DidComplete();
task->DispatchCompletionCallback();
- image_tasks_.erase(task);
+ image_tasks_.erase(task.get());
}
} // namespace cc
« no previous file with comments | « cc/base/worker_pool.cc ('k') | cc/resources/pixel_buffer_raster_worker_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698