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

cc/resources/resource_provider.cc

 // Copyright 2012 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/resource_provider.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/containers/hash_tables.h"
@@ skipping 383 matching lines @@
       shared_bitmap_id(bitmap_id),
       shared_bitmap(NULL) {
   DCHECK(wrap_mode == GL_CLAMP_TO_EDGE || wrap_mode == GL_REPEAT);
 }
 
 ResourceProvider::RasterBuffer::RasterBuffer(
     const Resource* resource,
     ResourceProvider* resource_provider)
     : resource_(resource),
       resource_provider_(resource_provider),
-      locked_canvas_(NULL),
       canvas_save_count_(0) {
   DCHECK(resource_);
   DCHECK(resource_provider_);
 }
 
 ResourceProvider::RasterBuffer::~RasterBuffer() {}
 
-SkCanvas* ResourceProvider::RasterBuffer::LockForWrite() {
+void ResourceProvider::RasterBuffer::LockForWrite() {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
                "ResourceProvider::RasterBuffer::LockForWrite");
 
   DCHECK(!locked_canvas_);
 
   locked_canvas_ = DoLockForWrite();
   canvas_save_count_ = locked_canvas_ ? locked_canvas_->save() : 0;
-  return locked_canvas_;
 }
 
 bool ResourceProvider::RasterBuffer::UnlockForWrite() {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
                "ResourceProvider::RasterBuffer::UnlockForWrite");
 
   if (locked_canvas_) {
     locked_canvas_->restoreToCount(canvas_save_count_);
     locked_canvas_ = NULL;
   }
@@ skipping 89 matching lines @@
     case RGB_565:
     case ETC1:
       NOTREACHED();
       break;
   }
   raster_canvas_ = skia::AdoptRef(new SkCanvas(raster_bitmap_));
   raster_bitmap_generation_id_ = raster_bitmap_.getGenerationID();
   return raster_canvas_.get();
 }
 
-bool ResourceProvider::BitmapRasterBuffer::DoUnlockForWrite() {
-  raster_canvas_.clear();
+void ResourceProvider::BitmapRasterBuffer::Flush() {
+  // Note that this function is called from a worker thread.
 
   // getGenerationID returns a non-zero, unique value corresponding to the
   // pixels in bitmap. Hence, a change since DoLockForWrite was called means the
   // bitmap has changed.
   bool raster_bitmap_changed =
       raster_bitmap_generation_id_ != raster_bitmap_.getGenerationID();
-
   if (raster_bitmap_changed) {
     SkColorType buffer_colorType =
         ResourceFormatToSkColorType(resource()->format);
     if (mapped_buffer_ && (buffer_colorType != raster_bitmap_.colorType()))
       CopyBitmap(raster_bitmap_, mapped_buffer_, buffer_colorType);
   }
+}
+
+bool ResourceProvider::BitmapRasterBuffer::DoUnlockForWrite() {
+  raster_canvas_.clear();
+
+  bool raster_bitmap_changed =
+      raster_bitmap_generation_id_ != raster_bitmap_.getGenerationID();
   raster_bitmap_.reset();
 
   UnmapBuffer();
   mapped_buffer_ = NULL;
   return raster_bitmap_changed;
 }
 
 ResourceProvider::ImageRasterBuffer::ImageRasterBuffer(
     const Resource* resource,
     ResourceProvider* resource_provider)
@@ skipping 1165 matching lines @@
   if (!to_return.empty())
     child_info->return_callback.Run(to_return);
 
   if (child_info->marked_for_deletion &&
       child_info->parent_to_child_map.empty()) {
     DCHECK(child_info->child_to_parent_map.empty());
     children_.erase(child_it);
   }
 }
 
-SkCanvas* ResourceProvider::MapGpuRasterBuffer(ResourceId id) {
+RasterCanvas* ResourceProvider::MapGpuRasterBuffer(ResourceId id) {
   // Resource needs to be locked for write since GpuRasterBuffer writes
   // directly to it.
   LockForWrite(id);
   Resource* resource = GetResource(id);
   if (!resource->gpu_raster_buffer.get()) {
     resource->gpu_raster_buffer.reset(
         new GpuRasterBuffer(resource, this, use_distance_field_text_));
   }
-  return resource->gpu_raster_buffer->LockForWrite();
+  resource->gpu_raster_buffer->LockForWrite();
+  return resource->gpu_raster_buffer.get();
 }
 
 void ResourceProvider::UnmapGpuRasterBuffer(ResourceId id) {
   Resource* resource = GetResource(id);
   DCHECK(resource->gpu_raster_buffer.get());
   resource->gpu_raster_buffer->UnlockForWrite();
   UnlockForWrite(id);
 }
 
-SkCanvas* ResourceProvider::MapImageRasterBuffer(ResourceId id) {
+RasterCanvas* ResourceProvider::MapImageRasterBuffer(ResourceId id) {
   Resource* resource = GetResource(id);
   AcquireImage(resource);
   if (!resource->image_raster_buffer.get())
     resource->image_raster_buffer.reset(new ImageRasterBuffer(resource, this));
-  return resource->image_raster_buffer->LockForWrite();
+  resource->image_raster_buffer->LockForWrite();
+  return resource->image_raster_buffer.get();
 }
 
 bool ResourceProvider::UnmapImageRasterBuffer(ResourceId id) {
   Resource* resource = GetResource(id);
   resource->dirty_image = true;
   return resource->image_raster_buffer->UnlockForWrite();
 }
 
 void ResourceProvider::AcquirePixelRasterBuffer(ResourceId id) {
   Resource* resource = GetResource(id);
   AcquirePixelBuffer(resource);
   resource->pixel_raster_buffer.reset(new PixelRasterBuffer(resource, this));
 }
 
 void ResourceProvider::ReleasePixelRasterBuffer(ResourceId id) {
   Resource* resource = GetResource(id);
   resource->pixel_raster_buffer.reset();
   ReleasePixelBuffer(resource);
 }
 
-SkCanvas* ResourceProvider::MapPixelRasterBuffer(ResourceId id) {
+RasterCanvas* ResourceProvider::MapPixelRasterBuffer(ResourceId id) {
   Resource* resource = GetResource(id);
   DCHECK(resource->pixel_raster_buffer.get());
-  return resource->pixel_raster_buffer->LockForWrite();
+  resource->pixel_raster_buffer->LockForWrite();
+  return resource->pixel_raster_buffer.get();
 }
 
 bool ResourceProvider::UnmapPixelRasterBuffer(ResourceId id) {
   Resource* resource = GetResource(id);
   DCHECK(resource->pixel_raster_buffer.get());
   return resource->pixel_raster_buffer->UnlockForWrite();
 }
 
 void ResourceProvider::AcquirePixelBuffer(Resource* resource) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
@@ skipping 463 matching lines @@
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->ContextGL() : NULL;
 }
 
 class GrContext* ResourceProvider::GrContext() const {
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->GrContext() : NULL;
 }
 
 }  // namespace cc