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

cc/resources/gpu_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/gpu_raster_worker_pool.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "cc/output/context_provider.h"
 #include "cc/resources/raster_buffer.h"
 #include "cc/resources/resource.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_gpu_raster.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/skia/include/core/SkMultiPictureDraw.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/skia/include/utils/SkNullCanvas.h"
 
 namespace cc {
 namespace {
 
 class RasterBufferImpl : public RasterBuffer {
  public:
   RasterBufferImpl(ResourceProvider* resource_provider,
                    const Resource* resource,
                    SkMultiPictureDraw* multi_picture_draw)
-      : resource_provider_(resource_provider),
+      : lock_(resource_provider, resource->id()),
         resource_(resource),
-        surface_(resource_provider->LockForWriteToSkSurface(resource->id())),
         multi_picture_draw_(multi_picture_draw) {}
-  virtual ~RasterBufferImpl() {
-    resource_provider_->UnlockForWriteToSkSurface(resource_->id());
-  }
 
   // Overridden from RasterBuffer:
   virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() override {
-    if (!surface_)
+    if (!lock_.sk_surface())
       return skia::AdoptRef(SkCreateNullCanvas());
 
     skia::RefPtr<SkCanvas> canvas = skia::SharePtr(recorder_.beginRecording(
         resource_->size().width(), resource_->size().height()));
 
     // Balanced with restore() call in ReleaseSkCanvas. save()/restore() calls
     // are needed to ensure that canvas returns to its previous state after use.
     canvas->save();
     return canvas;
   }
   virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) override {
-    if (!surface_)
+    if (!lock_.sk_surface())
       return;
 
     // Balanced with save() call in AcquireSkCanvas.
     canvas->restore();
 
     // Add the canvas and recorded picture to |multi_picture_draw_|.
     skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder_.endRecording());
-    multi_picture_draw_->add(surface_->getCanvas(), picture.get());
+    multi_picture_draw_->add(lock_.sk_surface()->getCanvas(), picture.get());
   }
 
  private:
-  ResourceProvider* resource_provider_;
+  ResourceProvider::ScopedWriteLockGr lock_;
   const Resource* resource_;
-  SkSurface* surface_;
   SkMultiPictureDraw* multi_picture_draw_;
   SkPictureRecorder recorder_;
 
   DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
 };
 
 }  // namespace
 
 // static
 scoped_ptr<RasterWorkerPool> GpuRasterWorkerPool::Create(
@@ skipping 114 matching lines @@
     task->CompleteOnOriginThread(this);
     task->DidComplete();
 
     task->RunReplyOnOriginThread();
   }
   completed_tasks_.clear();
 }
 
 scoped_ptr<RasterBuffer> GpuRasterWorkerPool::AcquireBufferForRaster(
     const Resource* resource) {
-  // RasterBuffer implementation depends on a SkSurface having been acquired for
-  // the resource.
-  resource_provider_->AcquireSkSurface(resource->id());
-
   return make_scoped_ptr<RasterBuffer>(
       new RasterBufferImpl(resource_provider_, resource, &multi_picture_draw_));
 }
 
 void GpuRasterWorkerPool::ReleaseBufferForRaster(
     scoped_ptr<RasterBuffer> buffer) {
   // Nothing to do here. RasterBufferImpl destructor cleans up after itself.
 }
 
 void GpuRasterWorkerPool::OnRasterFinished(TaskSet task_set) {
@@ skipping 24 matching lines @@
 
   ScopedGpuRaster gpu_raster(context_provider_);
   task_graph_runner_->RunUntilIdle();
 
   // Draw each all of the pictures that were collected.  This will also clear
   // the pictures and canvases added to |multi_picture_draw_|
   multi_picture_draw_.draw();
 }
 
 }  // namespace cc