cc: Move RasterBuffer implementations from ResourceProvider to RasterWorkerPool implementations.

cc/resources/image_raster_worker_pool.cc

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 5cd42dabf0553fefa27856995485166fca8fe727..64f7ac2481784a5ffbb7c703ea7efff84e4c6300 100644
--- a/cc/resources/image_raster_worker_pool.cc
+++ b/cc/resources/image_raster_worker_pool.cc
@@ -7,9 +7,63 @@
 #include "base/debug/trace_event.h"
 #include "base/debug/trace_event_argument.h"
 #include "cc/debug/traced_value.h"
+#include "cc/resources/raster_buffer.h"
 #include "cc/resources/resource.h"
+#include "third_party/skia/include/utils/SkNullCanvas.h"
 
 namespace cc {
+namespace {
+
+class RasterBufferImpl : public RasterBuffer {
+ public:
+  RasterBufferImpl(ResourceProvider* resource_provider,
+                   const Resource* resource)
+      : resource_provider_(resource_provider),
+        resource_(resource),
+        buffer_(NULL),
+        stride_(0) {
+    // This RasterBuffer implementation provides direct access to the memory
+    // used by the GPU. Read lock fences are required to ensure that we're not
+    // trying to map a resource that is currently in-use by the GPU.
+    resource_provider_->EnableReadLockFences(resource_->id());
+
+    // Acquire and map image.
+    resource_provider_->AcquireImage(resource_->id());
+    buffer_ = resource_provider_->MapImage(resource_->id(), &stride_);
+  }
+
+  virtual ~RasterBufferImpl() {
+    resource_provider_->UnmapImage(resource_->id());
+  }
+
+  // Overridden from RasterBuffer:
+  virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() OVERRIDE {
+    if (!buffer_)
+      return skia::AdoptRef(SkCreateNullCanvas());
+
+    RasterWorkerPool::AcquireBitmapForBuffer(
+        &bitmap_, buffer_, resource_->format(), resource_->size(), stride_);
+    return skia::AdoptRef(new SkCanvas(bitmap_));
+  }
+  virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) OVERRIDE {
+    if (!buffer_)
+      return;
+
+    RasterWorkerPool::ReleaseBitmapForBuffer(
+        &bitmap_, buffer_, resource_->format());
+  }
+
+ private:
+  ResourceProvider* resource_provider_;
+  const Resource* resource_;
+  uint8_t* buffer_;
+  int stride_;
+  SkBitmap bitmap_;
+
+  DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
+};
+
+}  // namespace
 
 // static
 scoped_ptr<RasterWorkerPool> ImageRasterWorkerPool::Create(
@@ -136,17 +190,15 @@ void ImageRasterWorkerPool::CheckForCompletedTasks() {
   completed_tasks_.clear();
 }
 
-RasterBuffer* ImageRasterWorkerPool::AcquireBufferForRaster(RasterTask* task) {
-  return resource_provider_->AcquireImageRasterBuffer(task->resource()->id());
+scoped_ptr<RasterBuffer> ImageRasterWorkerPool::AcquireBufferForRaster(
+    const Resource* resource) {
+  return make_scoped_ptr<RasterBuffer>(
+      new RasterBufferImpl(resource_provider_, resource));
 }
 
-void ImageRasterWorkerPool::ReleaseBufferForRaster(RasterTask* task) {
-  resource_provider_->ReleaseImageRasterBuffer(task->resource()->id());
-
-  // Acquire/ReleaseImageRasterBuffer provides direct access to the memory used
-  // by the GPU. Read lock fences are required to ensure that we're not trying
-  // to map a resource that is currently in-use by the GPU.
-  resource_provider_->EnableReadLockFences(task->resource()->id());

[vmpstr, 2014/09/17 15:53:02]

This changed from being the last thing we do to being the first thing we do. I
think that's a good change, but consider making it separately as well (It's
easier to look at this change when it's mostly just moving code around instead
of reordering)

[reveman, 2014/09/17 16:22:54]

Ok, keeping it as the last thing we do for now.

+void ImageRasterWorkerPool::ReleaseBufferForRaster(
+    scoped_ptr<RasterBuffer> buffer) {
+  // Nothing to do here. RasterBufferImpl destructor cleans up after itself.
 }
 
 void ImageRasterWorkerPool::OnRasterFinished() {