cc: Add ScopedWriteLock classes for raster to GpuMemoryBuffer or using Ganesh.

cc/resources/one_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/one_copy_raster_worker_pool.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/debug/trace_event_argument.h"
@@ skipping 10 matching lines @@
 
 class RasterBufferImpl : public RasterBuffer {
  public:
   RasterBufferImpl(ResourceProvider* resource_provider,
                    ResourcePool* resource_pool,
                    const Resource* resource)
       : resource_provider_(resource_provider),
         resource_pool_(resource_pool),
         resource_(resource),
         raster_resource_(resource_pool->AcquireResource(resource->size())),
-        buffer_(NULL),
-        stride_(0) {
-    // Acquire and map image for raster resource.
-    resource_provider_->AcquireImage(raster_resource_->id());
-    buffer_ = resource_provider_->MapImage(raster_resource_->id(), &stride_);
-  }
+        lock_(new ResourceProvider::ScopedWriteLockGpuMemoryBuffer(
+            resource_provider_,
+            raster_resource_->id())),
+        buffer_(NULL) {}
 
   virtual ~RasterBufferImpl() {
-    // First unmap image for raster resource.
-    resource_provider_->UnmapImage(raster_resource_->id());
+    // First unlock raster resource.
+    lock_.reset();
 
     // Copy contents of raster resource to |resource_|.
     resource_provider_->CopyResource(raster_resource_->id(), resource_->id());
 
-    // 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(raster_resource_->id());
-
     // Return raster resource to pool so it can be used by another RasterBuffer
     // instance.
     resource_pool_->ReleaseResource(raster_resource_.Pass());
   }
 
   // Overridden from RasterBuffer:
   virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() override {
+    buffer_ = lock_->gpu_memory_buffer();
     if (!buffer_)
       return skia::AdoptRef(SkCreateNullCanvas());
 
-    RasterWorkerPool::AcquireBitmapForBuffer(
-        &bitmap_, buffer_, resource_->format(), resource_->size(), stride_);
+    RasterWorkerPool::AcquireBitmapForBuffer(&bitmap_,
+                                             buffer_,
+                                             resource_->format(),
+                                             resource_->size(),
+                                             lock_->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_;
   ResourcePool* resource_pool_;
   const Resource* resource_;
   scoped_ptr<ScopedResource> raster_resource_;
-  uint8_t* buffer_;
-  int stride_;
+  scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> lock_;
+  void* buffer_;
   SkBitmap bitmap_;
 
   DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
 };
 
 }  // namespace
 
 // static
 scoped_ptr<RasterWorkerPool> OneCopyRasterWorkerPool::Create(
     base::SequencedTaskRunner* task_runner,
@@ skipping 185 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