cc: Move GpuMemoryBuffer allocation to worker threads.

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 14 matching lines @@
   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())),
         lock_(new ResourceProvider::ScopedWriteLockGpuMemoryBuffer(
             resource_provider_,
             raster_resource_->id())),
-        buffer_(NULL) {}
+        gpu_memory_buffer_(nullptr),
+        buffer_(nullptr) {}
 
   virtual ~RasterBufferImpl() {
     // First unlock raster resource.
     lock_.reset();
 
     // Copy contents of raster resource to |resource_|.
-    resource_provider_->CopyResource(raster_resource_->id(), resource_->id());
+    if (gpu_memory_buffer_)
+      resource_provider_->CopyResource(raster_resource_->id(), 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 {
-    gfx::GpuMemoryBuffer* gpu_memory_buffer = lock_->gpu_memory_buffer();
-    if (!gpu_memory_buffer)
+    gpu_memory_buffer_ = lock_->GetGpuMemoryBuffer();
+    if (!gpu_memory_buffer_)
       return skia::AdoptRef(SkCreateNullCanvas());
 
-    buffer_ = gpu_memory_buffer->Map();
+    buffer_ = gpu_memory_buffer_->Map();
     RasterWorkerPool::AcquireBitmapForBuffer(&bitmap_,
                                              buffer_,
                                              resource_->format(),
                                              resource_->size(),
-                                             gpu_memory_buffer->GetStride());
+                                             gpu_memory_buffer_->GetStride());
     return skia::AdoptRef(new SkCanvas(bitmap_));
   }
   virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) override {
-    gfx::GpuMemoryBuffer* gpu_memory_buffer = lock_->gpu_memory_buffer();
-    if (!gpu_memory_buffer)
+    if (!gpu_memory_buffer_)
       return;
 
     RasterWorkerPool::ReleaseBitmapForBuffer(
         &bitmap_, buffer_, resource_->format());
-    gpu_memory_buffer->Unmap();
+    gpu_memory_buffer_->Unmap();
   }
 
  private:
   ResourceProvider* resource_provider_;
   ResourcePool* resource_pool_;
   const Resource* resource_;
   scoped_ptr<ScopedResource> raster_resource_;
   scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> lock_;
+  gfx::GpuMemoryBuffer* gpu_memory_buffer_;
   void* buffer_;
   SkBitmap bitmap_;
 
   DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
 };
 
 }  // namespace
 
 // static
 scoped_ptr<RasterWorkerPool> OneCopyRasterWorkerPool::Create(
@@ skipping 186 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