cc: Do bitmap conversion for RasterBuffer in the worker thread.

cc/resources/image_copy_raster_worker_pool.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/image_copy_raster_worker_pool.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/debug/trace_event_argument.h"
@@ skipping 148 matching lines @@
     task->CompleteOnOriginThread(this);
     task->DidComplete();
 
     task->RunReplyOnOriginThread();
   }
   completed_tasks_.clear();
 
   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_->AcquireImageRasterBuffer(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(),
                    RasterTaskState::TaskComparator(task));
   DCHECK(it != raster_task_states_.end());
   scoped_ptr<ScopedResource> resource(it->resource);
   std::swap(*it, raster_task_states_.back());
   raster_task_states_.pop_back();
 
   bool content_has_changed =
-      resource_provider_->UnmapImageRasterBuffer(resource->id());
+      resource_provider_->ReleaseImageRasterBuffer(resource->id());
 
   // |content_has_changed| can be false as result of task being canceled or
   // task implementation deciding not to modify bitmap (ie. analysis of raster
   // commands detected content as a solid color).
   if (content_has_changed) {
     resource_provider_->CopyResource(resource->id(), task->resource()->id());
     has_performed_copy_since_last_flush_ = true;
   }
 
   resource_pool_->ReleaseResource(resource.Pass());
@@ skipping 49 matching lines @@
                             resource_pool_->total_memory_usage_bytes());
   staging_state->SetInteger("pending_copy_count",
                             resource_pool_->total_resource_count() -
                                 resource_pool_->acquired_resource_count());
   staging_state->SetInteger("bytes_pending_copy",
                             resource_pool_->total_memory_usage_bytes() -
                                 resource_pool_->acquired_memory_usage_bytes());
 }
 
 }  // namespace cc