| Index: cc/resources/image_copy_raster_worker_pool.cc
|
| diff --git a/cc/resources/image_copy_raster_worker_pool.cc b/cc/resources/image_copy_raster_worker_pool.cc
|
| index 2a9b7f1eaac087729cb005978b5df888e9dbc888..4eaa4c7eaf0b74bcdd98359a66562b17cf47dd6d 100644
|
| --- a/cc/resources/image_copy_raster_worker_pool.cc
|
| +++ b/cc/resources/image_copy_raster_worker_pool.cc
|
| @@ -166,20 +166,22 @@ void ImageCopyRasterWorkerPool::CheckForCompletedTasks() {
|
| FlushCopies();
|
| }
|
|
|
| -SkCanvas* ImageCopyRasterWorkerPool::AcquireCanvasForRaster(RasterTask* task) {
|
| +RasterBuffer* ImageCopyRasterWorkerPool::AcquireBufferForRaster(
|
| + RasterTask* task) {
|
| DCHECK_EQ(task->resource()->format(), resource_pool_->resource_format());
|
| scoped_ptr<ScopedResource> resource(
|
| resource_pool_->AcquireResource(task->resource()->size()));
|
| - SkCanvas* canvas = resource_provider_->MapImageRasterBuffer(resource->id());
|
| + RasterBuffer* raster_buffer =
|
| + resource_provider_->MapImageRasterBuffer(resource->id());
|
| DCHECK(std::find_if(raster_task_states_.begin(),
|
| raster_task_states_.end(),
|
| RasterTaskState::TaskComparator(task)) ==
|
| raster_task_states_.end());
|
| raster_task_states_.push_back(RasterTaskState(task, resource.release()));
|
| - return canvas;
|
| + return raster_buffer;
|
| }
|
|
|
| -void ImageCopyRasterWorkerPool::ReleaseCanvasForRaster(RasterTask* task) {
|
| +void ImageCopyRasterWorkerPool::ReleaseBufferForRaster(RasterTask* task) {
|
| RasterTaskState::Vector::iterator it =
|
| std::find_if(raster_task_states_.begin(),
|
| raster_task_states_.end(),
|
|
|