commit 41e010cb901c0da9066c4df562030808c9ccd7f8
author reed <reed@google.com> Tue Jun 09 12:16:53 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jun 09 12:16:53 2015 -0700
tree 3bf17e946f9eadd43040ea6968adcfa5f2f882a4
parent 1831f990c31bad0d84641663c96aa8eebf846ab9

Revert[2] SkDraw and all Blitters to use pixmap instead of bitmapi

This reverts commit b3f0ec9f9967da2f80f0d842cb7fd53617b48de3.

BUG=skia:

Review URL: https://codereview.chromium.org/1168303006

src/core/SkBlitMask_D32.cpp

diff --git a/src/core/SkBlitMask_D32.cpp b/src/core/SkBlitMask_D32.cpp
index 594a274..2108108 100644
--- a/src/core/SkBlitMask_D32.cpp
+++ b/src/core/SkBlitMask_D32.cpp
@@ -147,13 +147,13 @@
     return NULL;
 }
 
-bool SkBlitMask::BlitColor(const SkBitmap& device, const SkMask& mask,
+bool SkBlitMask::BlitColor(const SkPixmap& device, const SkMask& mask,
                            const SkIRect& clip, SkColor color) {
     ColorProc proc = ColorFactory(device.colorType(), mask.fFormat, color);
     if (proc) {
         int x = clip.fLeft;
         int y = clip.fTop;
-        proc(device.getAddr32(x, y), device.rowBytes(), mask.getAddr(x, y),
+        proc(device.writable_addr32(x, y), device.rowBytes(), mask.getAddr(x, y),
              mask.fRowBytes, color, clip.width(), clip.height());
         return true;
     }