Index: Source/platform/graphics/DeferredImageDecoderTest.cpp |
diff --git a/Source/platform/graphics/DeferredImageDecoderTest.cpp b/Source/platform/graphics/DeferredImageDecoderTest.cpp |
index e98d804ec2207d444c6bbc07014c8759ad336ae2..a8a86e3aa761815953506b07d0d709ad76992d45 100644 |
--- a/Source/platform/graphics/DeferredImageDecoderTest.cpp |
+++ b/Source/platform/graphics/DeferredImageDecoderTest.cpp |
@@ -61,8 +61,9 @@ const unsigned char whitePNG[] = { |
static SkCanvas* createRasterCanvas(int width, int height) |
{ |
- SkAutoTUnref<SkBaseDevice> device(new SkBitmapDevice(SkBitmap::kARGB_8888_Config, width, height)); |
- return new SkCanvas(device); |
+ SkBitmap bitmap; |
+ bitmap.allocN32Pixels(width, height); |
+ return new SkCanvas(bitmap); |
reed1
2014/03/17 13:25:18
There is an even nicer way to to this...
return S
jbroman
2014/03/17 16:46:38
Done, and inlined at the call site.
|
} |
struct Rasterizer { |
@@ -170,7 +171,7 @@ TEST_F(DeferredImageDecoderTest, drawIntoSkPicture) |
EXPECT_EQ(0, m_frameBufferRequestCount); |
SkBitmap canvasBitmap; |
- canvasBitmap.setConfig(SkBitmap::kARGB_8888_Config, 100, 100); |
+ canvasBitmap.allocN32Pixels(100, 100); |
ASSERT_TRUE(m_canvas->readPixels(&canvasBitmap, 0, 0)); |
SkAutoLockPixels autoLock(canvasBitmap); |
EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0)); |
@@ -197,7 +198,7 @@ TEST_F(DeferredImageDecoderTest, drawIntoSkPictureProgressive) |
m_canvas->drawPicture(m_picture); |
SkBitmap canvasBitmap; |
- canvasBitmap.setConfig(SkBitmap::kARGB_8888_Config, 100, 100); |
+ canvasBitmap.allocN32Pixels(100, 100); |
ASSERT_TRUE(m_canvas->readPixels(&canvasBitmap, 0, 0)); |
SkAutoLockPixels autoLock(canvasBitmap); |
EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0)); |
@@ -229,7 +230,7 @@ TEST_F(DeferredImageDecoderTest, decodeOnOtherThread) |
EXPECT_EQ(0, m_frameBufferRequestCount); |
SkBitmap canvasBitmap; |
- canvasBitmap.setConfig(SkBitmap::kARGB_8888_Config, 100, 100); |
+ canvasBitmap.allocN32Pixels(100, 100); |
ASSERT_TRUE(m_canvas->readPixels(&canvasBitmap, 0, 0)); |
SkAutoLockPixels autoLock(canvasBitmap); |
EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0)); |