Remove uses of SkBitmap::Config (deprecated) from core/ and platform/.

Source/platform/graphics/DeferredImageDecoderTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 43 matching lines @@
     0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
     0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00,
     0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, 0xd7, 0x63, 0xf8, 0xff,
     0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, 0xcc, 0x59,
     0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
     0x42, 0x60, 0x82,
 };
 
 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 SkCanvas::NewRasterN32(width, height);

One advantage is that it will return NULL if it cannot allocate the canvas or
its pixels.

[jbroman, 2014/03/17 16:46:38]

Done, and inlined at the call site.

 }
 
 struct Rasterizer {
     SkCanvas* canvas;
     SkPicture* picture;
 };
 
 } // namespace
 
 class DeferredImageDecoderTest : public ::testing::Test, public MockImageDecoderClient {
@@ skipping 87 matching lines @@
 
     SkCanvas* tempCanvas = m_picture.beginRecording(100, 100);
     tempCanvas->drawBitmap(image->bitmap(), 0, 0);
     m_picture.endRecording();
     EXPECT_EQ(0, m_frameBufferRequestCount);
 
     m_canvas->drawPicture(m_picture);
     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));
 }
 
 TEST_F(DeferredImageDecoderTest, drawIntoSkPictureProgressive)
 {
     RefPtr<SharedBuffer> partialData = SharedBuffer::create(m_data->data(), m_data->size() - 10);
 
     // Received only half the file.
     m_lazyDecoder->setData(partialData.get(), false);
     RefPtr<NativeImageSkia> image = m_lazyDecoder->frameBufferAtIndex(0)->asNewNativeImage();
     SkCanvas* tempCanvas = m_picture.beginRecording(100, 100);
     tempCanvas->drawBitmap(image->bitmap(), 0, 0);
     m_picture.endRecording();
     m_canvas->drawPicture(m_picture);
 
     // Fully received the file and draw the SkPicture again.
     m_lazyDecoder->setData(m_data.get(), true);
     image = m_lazyDecoder->frameBufferAtIndex(0)->asNewNativeImage();
     tempCanvas = m_picture.beginRecording(100, 100);
     tempCanvas->drawBitmap(image->bitmap(), 0, 0);
     m_picture.endRecording();
     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));
 }
 
 static void rasterizeMain(SkCanvas* canvas, SkPicture* picture)
 {
     canvas->drawPicture(*picture);
 }
 
@@ skipping 11 matching lines @@
     m_picture.endRecording();
     EXPECT_EQ(0, m_frameBufferRequestCount);
 
     // Create a thread to rasterize SkPicture.
     OwnPtr<blink::WebThread> thread = adoptPtr(blink::Platform::current()->createThread("RasterThread"));
     thread->postTask(new Task(WTF::bind(&rasterizeMain, m_canvas.get(), &m_picture)));
     thread.clear();
     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));
 }
 
 TEST_F(DeferredImageDecoderTest, singleFrameImageLoading)
 {
     m_status = ImageFrame::FramePartial;
     m_lazyDecoder->setData(m_data.get(), false);
     EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
@@ skipping 81 matching lines @@
     // The following code should not fail any assert.
     SkCanvas* tempCanvas = m_picture.beginRecording(100, 100);
     tempCanvas->drawBitmap(image->bitmap(), 0, 0);
     m_picture.endRecording();
     EXPECT_EQ(0, m_frameBufferRequestCount);
     m_canvas->drawPicture(m_picture);
     EXPECT_EQ(1, m_frameBufferRequestCount);
 }
 
 } // namespace WebCore