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

Unified Diff: cc/resources/pixel_buffer_raster_worker_pool.cc

Issue 17948002: Update Linux to use scoped_refptr<T>::get() rather than 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/layers/texture_layer.h ('k') | cc/resources/raster_worker_pool.cc » ('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 14a2536876e2c9f3b9a5f2f56a083db7020c2a3a..bbdb5321f80ebbaafd4622944329b106699e406f 100644
--- a/cc/resources/pixel_buffer_raster_worker_pool.cc
+++ b/cc/resources/pixel_buffer_raster_worker_pool.cc
@@ -229,7 +229,7 @@ void PixelBufferRasterWorkerPool::CheckForCompletedUploads() {
TaskDeque tasks_with_uploads_to_force;
TaskDeque::iterator it = tasks_with_pending_upload_.begin();
while (it != tasks_with_pending_upload_.end()) {
- internal::RasterWorkerPoolTask* task = *it;
+ internal::RasterWorkerPoolTask* task = it->get();
DCHECK(pixel_buffer_tasks_.find(task) != pixel_buffer_tasks_.end());
// Force all uploads required for activation to complete.
@@ -339,7 +339,7 @@ void PixelBufferRasterWorkerPool::ScheduleMoreTasks() {
if (new_bytes_pending_upload > kMaxPendingUploadBytes)
break;
- internal::WorkerPoolTask* pixel_buffer_task = pixel_buffer_it->second;
+ internal::WorkerPoolTask* pixel_buffer_task = pixel_buffer_it->second.get();
// If raster has finished, just update |bytes_pending_upload|.
if (pixel_buffer_task && pixel_buffer_task->HasCompleted()) {
« no previous file with comments | « cc/layers/texture_layer.h ('k') | cc/resources/raster_worker_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698