Remove use of SkBitmap::Config (deprecated) from Source/web/tests/.

Source/web/tests/GraphicsContextTest.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
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "platform/graphics/GraphicsContext.h"
 
-#include "SkCanvas.h"
 #include "platform/graphics/BitmapImage.h"
 #include "platform/graphics/DisplayList.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/skia/NativeImageSkia.h"
-#include "third_party/skia/include/core/SkBitmapDevice.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkCanvas.h"
 #include <gtest/gtest.h>
 
 using namespace WebCore;
 
 namespace {
 
 #define EXPECT_EQ_RECT(a, b) \
     EXPECT_EQ(a.x(), b.x()); \
     EXPECT_EQ(a.y(), b.y()); \
     EXPECT_EQ(a.width(), b.width()); \
@@ skipping 16 matching lines @@
         for (int x = 0; x < bitmap.width(); ++x) {     \
             int alpha = *bitmap.getAddr32(x, y) >> 24; \
             bool opaque = opaqueRect.contains(x, y); \
             EXPECT_EQ(opaque, alpha == 255); \
         } \
 }
 
 TEST(GraphicsContextTest, trackOpaqueTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
     context.fillRect(FloatRect(10, 10, 90, 90), opaque, CompositeSourceOver);
@@ skipping 37 matching lines @@
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 
     context.fillRect(FloatRect(10, 10, 390, 50), opaque, CompositeSourceOver);
     EXPECT_EQ_RECT(IntRect(30, 10, 290, 310), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackOpaqueClipTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
     context.fillRect(FloatRect(10, 10, 90, 90), opaque, CompositeSourceOver);
     EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), context.opaqueRegion().asRect());
@@ skipping 73 matching lines @@
     context.clipOut(IntRect(30, 30, 10, 10));
     context.fillRect(FloatRect(10, 10, 90, 90), opaque, CompositeSourceOver);
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
     context.restore();
 }
 
 TEST(GraphicsContextTest, trackImageMask)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
     // Image masks are done by drawing a bitmap into a transparency layer that uses DstIn to mask
@@ skipping 16 matching lines @@
     context.endLayer();
     context.endLayer();
 
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH_EXACT(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackImageMaskWithOpaqueRect)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
     // Image masks are done by drawing a bitmap into a transparency layer that uses DstIn to mask
@@ skipping 19 matching lines @@
     context.endLayer();
     context.endLayer();
 
     EXPECT_EQ_RECT(IntRect(12, 12, 3, 3), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH_EXACT(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackOpaqueJoinTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
     context.fillRect(FloatRect(20, 20, 10, 10), opaque, CompositeSourceOver);
     EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), context.opaqueRegion().asRect());
@@ skipping 36 matching lines @@
 
     // Does join
     context.fillRect(FloatRect(10, 10, 30, 10), opaque, CompositeSourceOver);
     EXPECT_EQ_RECT(IntRect(10, 10, 30, 30), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackOpaqueLineTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
     context.setShouldAntialias(false);
@@ skipping 73 matching lines @@
     context.setStrokeColor(alpha);
     context.drawLine(IntPoint(0, 11), IntPoint(100, 11));
     context.restore();
     EXPECT_EQ_RECT(IntRect(10, 14, 90, 86), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackOpaquePathTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
     context.fillRect(FloatRect(10, 10, 90, 90), opaque, CompositeSourceOver);
     EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), context.opaqueRegion().asRect());
@@ skipping 37 matching lines @@
     path.addLineTo(FloatPoint(100, 10));
     context.fillPath(path);
     EXPECT_EQ_RECT(IntRect(10, 14, 90, 86), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
     path.clear();
 }
 
 TEST(GraphicsContextTest, trackOpaqueImageTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
     SkBitmap opaqueBitmap;
-    opaqueBitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10, 0, kOpaque_SkAlphaType);
-    opaqueBitmap.allocPixels();
+    ASSERT_TRUE(opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */));
 
     for (int y = 0; y < opaqueBitmap.height(); ++y)
         for (int x = 0; x < opaqueBitmap.width(); ++x)
             *opaqueBitmap.getAddr32(x, y) = 0xFFFFFFFF;
     RefPtr<BitmapImage> opaqueImage = BitmapImage::create(NativeImageSkia::create(opaqueBitmap));
     EXPECT_TRUE(opaqueImage->currentFrameKnownToBeOpaque());
 
     SkBitmap alphaBitmap;
-    alphaBitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10, 0, kPremul_SkAlphaType);
-    alphaBitmap.allocPixels();
+    ASSERT_TRUE(alphaBitmap.allocN32Pixels(10, 10));
 
     for (int y = 0; y < alphaBitmap.height(); ++y)
         for (int x = 0; x < alphaBitmap.width(); ++x)
             *alphaBitmap.getAddr32(x, y) = 0x00000000;
     RefPtr<BitmapImage> alphaImage = BitmapImage::create(NativeImageSkia::create(alphaBitmap));
     EXPECT_FALSE(alphaImage->currentFrameKnownToBeOpaque());
 
     context.fillRect(FloatRect(10, 10, 90, 90), opaque, CompositeSourceOver);
     EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
@@ skipping 42 matching lines @@
     context.setAlphaAsFloat(0.5);
     context.drawImage(opaqueImage.get(), IntPoint(15, 25), CompositeSourceIn);
     context.restore();
     EXPECT_EQ_RECT(IntRect(25, 10, 75, 90), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackOpaqueOvalTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
     EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), context.opaqueRegion().asRect());
@@ skipping 30 matching lines @@
 
     context.setFillColor(alpha);
     context.drawEllipse(IntRect(20, 10, 30, 50));
     EXPECT_EQ_RECT(IntRect(51, 41, 49, 59), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackOpaqueRoundedRectTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
-    bitmap.allocPixels();
-    bitmap.eraseColor(0);
+    ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
     IntSize radii(10, 10);
 
     EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), context.opaqueRegion().asRect());
@@ skipping 24 matching lines @@
 
     context.fillRoundedRect(IntRect(30, 0, 70, 50), radii, radii, radii, radii, opaque);
     EXPECT_EQ_RECT(IntRect(40, 30, 60, 70), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackOpaqueTextTest)
 {
     int width = 200, height = 200;
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(width, height));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
     SkRect textRect = SkRect::MakeWH(width, height);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
@@ skipping 43 matching lines @@
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 
     context.drawTextOnPath("A", 1, path, textRect, 0, alphaPaint);
     EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackOpaqueWritePixelsTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
 
     SkBitmap opaqueBitmap;
-    opaqueBitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10, 0, kOpaque_SkAlphaType);
-    opaqueBitmap.allocPixels();
+    ASSERT_TRUE(opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */));
     for (int y = 0; y < opaqueBitmap.height(); ++y)
         for (int x = 0; x < opaqueBitmap.width(); ++x)
             *opaqueBitmap.getAddr32(x, y) = 0xFFFFFFFF;
 
     SkBitmap alphaBitmap;
-    alphaBitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10, 0, kPremul_SkAlphaType);
-    alphaBitmap.allocPixels();
+    ASSERT_TRUE(alphaBitmap.allocN32Pixels(10, 10));
     for (int y = 0; y < alphaBitmap.height(); ++y)
         for (int x = 0; x < alphaBitmap.width(); ++x)
             *alphaBitmap.getAddr32(x, y) = 0x00000000;
 
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
 
     context.writePixels(opaqueBitmap, 50, 50);
     EXPECT_EQ_RECT(IntRect(50, 50, 10, 10), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
@@ skipping 15 matching lines @@
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 
     context.writePixels(alphaBitmap, 1, 10);
     EXPECT_EQ_RECT(IntRect(11, 11, 89, 89), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackOpaqueDrawBitmapTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
 
     SkBitmap opaqueBitmap;
-    opaqueBitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10, 0, kOpaque_SkAlphaType);
-    opaqueBitmap.allocPixels();
+    ASSERT_TRUE(opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */));
     for (int y = 0; y < opaqueBitmap.height(); ++y)
         for (int x = 0; x < opaqueBitmap.width(); ++x)
             *opaqueBitmap.getAddr32(x, y) = 0xFFFFFFFF;
 
     SkBitmap alphaBitmap;
-    alphaBitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10, 0, kPremul_SkAlphaType);
-    alphaBitmap.allocPixels();
+    ASSERT_TRUE(alphaBitmap.allocN32Pixels(10, 10));
     for (int y = 0; y < alphaBitmap.height(); ++y)
         for (int x = 0; x < alphaBitmap.width(); ++x)
             *alphaBitmap.getAddr32(x, y) = 0x00000000;
 
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
 
     context.drawBitmap(opaqueBitmap, 10, 10, &paint);
     EXPECT_EQ_RECT(IntRect(10, 10, 10, 10), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
@@ skipping 15 matching lines @@
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 
     context.drawBitmap(alphaBitmap, 1, 10, &paint);
     EXPECT_EQ_RECT(IntRect(11, 11, 89, 89), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackOpaqueDrawBitmapRectTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
 
     SkBitmap opaqueBitmap;
-    opaqueBitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10, 0, kOpaque_SkAlphaType);
-    opaqueBitmap.allocPixels();
+    ASSERT_TRUE(opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */));
     for (int y = 0; y < opaqueBitmap.height(); ++y)
         for (int x = 0; x < opaqueBitmap.width(); ++x)
             *opaqueBitmap.getAddr32(x, y) = 0xFFFFFFFF;
 
     SkBitmap alphaBitmap;
-    alphaBitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10, 0, kPremul_SkAlphaType);
-    alphaBitmap.allocPixels();
+    ASSERT_TRUE(alphaBitmap.allocN32Pixels(10, 10));
     for (int y = 0; y < alphaBitmap.height(); ++y)
         for (int x = 0; x < alphaBitmap.width(); ++x)
             *alphaBitmap.getAddr32(x, y) = 0x00000000;
 
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
 
     context.drawBitmapRect(opaqueBitmap, 0, SkRect::MakeXYWH(10, 10, 90, 90), &paint);
     EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
@@ skipping 11 matching lines @@
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 
     context.drawBitmapRect(alphaBitmap, 0, SkRect::MakeXYWH(0, 10, 11, 10), &paint);
     EXPECT_EQ_RECT(IntRect(11, 11, 89, 89), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, contextTransparencyLayerTest)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     context.fillRect(FloatRect(20, 20, 10, 10), opaque, CompositeSourceOver);
     EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
@@ skipping 13 matching lines @@
 
     context.beginTransparencyLayer(0.5);
     context.fillRect(FloatRect(20, 20, 10, 10), opaque, CompositeSourceOver);
     context.endLayer();
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, UnboundedDrawsAreClipped)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
     Path path;
@@ skipping 24 matching lines @@
     path.addLineTo(FloatPoint(40, 40));
     context.strokePath(path);
 
     EXPECT_EQ_RECT(IntRect(20, 10, 30, 40), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, PreserveOpaqueOnlyMattersForFirstLayer)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas);
     context.setTrackOpaqueRegion(true);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
 
     Path path;
@@ skipping 61 matching lines @@
     context.endLayer();
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH_EXACT(bitmap, context.opaqueRegion().asRect());
 }
 
 #define DISPATCH(c1, c2, op, params) do { c1.op(params); c2.op(params); } while (0);
 
 TEST(GraphicsContextTest, RecordingTotalMatrix)
 {
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
-    bitmap.allocPixels();
+    ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
     GraphicsContext context(&canvas);
 
-    SkBitmapDevice controlDevice(SkBitmap::kNo_Config, 400, 400);
-    SkCanvas controlCanvas(&controlDevice);
+    SkCanvas controlCanvas(400, 400);
     GraphicsContext controlContext(&controlCanvas);
 
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
     DISPATCH(context, controlContext, scale, FloatSize(2, 2));
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
     controlContext.save();
     context.beginRecording(FloatRect(0, 0, 200, 200));
     DISPATCH(context, controlContext, translate, FloatSize(10, 10));
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
     controlContext.save();
     context.beginRecording(FloatRect(10, 10, 100, 100));
     DISPATCH(context, controlContext, rotate, 45);
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
     controlContext.restore();
     context.endRecording();
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
     controlContext.restore();
     context.endRecording();
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 }
 
 } // namespace