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

cc/resources/resource_provider_unittest.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 <map>
 #include <set>
 
@@ skipping 936 matching lines @@
       size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);
   uint8_t data2[4] = { 5, 5, 5, 5 };
   child_resource_provider_->SetPixels(id2, data2, rect, rect, gfx::Vector2d());
 
   ResourceProvider::ResourceId id3 = child_resource_provider_->CreateResource(
       size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);
   uint8_t data3[4] = { 6, 7, 8, 9 };
   SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height());
   RasterBuffer* raster_buffer =
       child_resource_provider_->AcquireImageRasterBuffer(id3);
-  SkCanvas* canvas = raster_buffer->AcquireSkCanvas();
+  skia::RefPtr<SkCanvas> canvas = raster_buffer->AcquireSkCanvas();
   canvas->writePixels(info, data3, info.minRowBytes(), 0, 0);
-  raster_buffer->ReleaseSkCanvas();
+  raster_buffer->ReleaseSkCanvas(canvas.get());
+  canvas.clear();
   child_resource_provider_->ReleaseImageRasterBuffer(id3);
 
   scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
   shared_memory->CreateAndMapAnonymous(1);
   base::SharedMemory* shared_memory_ptr = shared_memory.get();
   ResourceProvider::ResourceId id4 =
       child_resource_provider_->CreateResourceFromTextureMailbox(
           TextureMailbox(shared_memory_ptr, gfx::Size(1, 1)),
           SingleReleaseCallback::Create(base::Bind(
               &SharedMemoryReleaseCallback, base::Passed(&shared_memory))));
@@ skipping 1963 matching lines @@
   scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
       output_surface.get(), shared_bitmap_manager_.get(), 0, false, 1, false));
 
   EXPECT_CALL(*context, NextTextureId()).WillRepeatedly(Return(texture_id));
 
   id = resource_provider->CreateResource(
       size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);
   context->loseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,
                                GL_INNOCENT_CONTEXT_RESET_ARB);
 
-  resource_provider->AcquirePixelRasterBuffer(id);
-  RasterBuffer* raster_buffer = resource_provider->MapPixelRasterBuffer(id);
-  SkCanvas* canvas = raster_buffer->AcquireSkCanvas();
-  EXPECT_TRUE(canvas == NULL);
-  raster_buffer->ReleaseSkCanvas();
-  resource_provider->UnmapPixelRasterBuffer(id);
+  RasterBuffer* raster_buffer = resource_provider->AcquirePixelRasterBuffer(id);
+  skia::RefPtr<SkCanvas> canvas = raster_buffer->AcquireSkCanvas();
+  EXPECT_TRUE(canvas.get() == NULL);
+  raster_buffer->ReleaseSkCanvas(canvas.get());
+  canvas.clear();
   resource_provider->ReleasePixelRasterBuffer(id);
   Mock::VerifyAndClearExpectations(context);
 }
 
 TEST_P(ResourceProviderTest, Image_GLTexture) {
   // Only for GL textures.
   if (GetParam() != ResourceProvider::GLTexture)
     return;
   scoped_ptr<AllocationTrackingContext3D> context_owned(
       new StrictMock<AllocationTrackingContext3D>);
@@ skipping 109 matching lines @@
   scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
       output_surface.get(), shared_bitmap_manager_.get(), 0, false, 1, false));
 
   id = resource_provider->CreateResource(
       size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(size.width(), size.height());
   *(bitmap.getAddr32(0, 0)) = kBadBeef;
   RasterBuffer* raster_buffer = resource_provider->AcquireImageRasterBuffer(id);
-  SkCanvas* canvas = raster_buffer->AcquireSkCanvas();
+  skia::RefPtr<SkCanvas> canvas = raster_buffer->AcquireSkCanvas();
   ASSERT_TRUE(!!canvas);
   canvas->writePixels(bitmap, 0, 0);
-  raster_buffer->ReleaseSkCanvas();
+  raster_buffer->ReleaseSkCanvas(canvas.get());
+  canvas.clear();
   resource_provider->ReleaseImageRasterBuffer(id);
 
   {
     ResourceProvider::ScopedReadLockSoftware lock(resource_provider.get(), id);
     const SkBitmap* sk_bitmap = lock.sk_bitmap();
     EXPECT_EQ(sk_bitmap->width(), size.width());
     EXPECT_EQ(sk_bitmap->height(), size.height());
     EXPECT_EQ(*sk_bitmap->getAddr32(0, 0), kBadBeef);
   }
 
@@ skipping 105 matching lines @@
       output_surface.get(), shared_bitmap_manager_.get(), 0, false, 1, false));
 
   source_id = resource_provider->CreateResource(
       size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(size.width(), size.height());
   *(bitmap.getAddr32(0, 0)) = kBadBeef;
   RasterBuffer* raster_buffer =
       resource_provider->AcquireImageRasterBuffer(source_id);
-  SkCanvas* canvas = raster_buffer->AcquireSkCanvas();
+  skia::RefPtr<SkCanvas> canvas = raster_buffer->AcquireSkCanvas();
   ASSERT_TRUE(!!canvas);
   canvas->writePixels(bitmap, 0, 0);
-  raster_buffer->ReleaseSkCanvas();
+  raster_buffer->ReleaseSkCanvas(canvas.get());
+  canvas.clear();
   resource_provider->ReleaseImageRasterBuffer(source_id);
 
   dest_id = resource_provider->CreateResource(
       size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);
 
   resource_provider->CopyResource(source_id, dest_id);
 
   {
     ResourceProvider::ScopedReadLockSoftware lock(resource_provider.get(),
                                                   dest_id);
@@ skipping 194 matching lines @@
     resource_provider->AllocateForTesting(id);
     Mock::VerifyAndClearExpectations(context);
 
     DCHECK_EQ(10u, context->PeekTextureId());
     resource_provider->DeleteResource(id);
   }
 }
 
 }  // namespace
 }  // namespace cc