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

src/core/SkBlitMask_D32.cpp

Index: src/core/SkBlitMask_D32.cpp
diff --git a/src/core/SkBlitMask_D32.cpp b/src/core/SkBlitMask_D32.cpp
index 594a274d42aec6189d5dfdec7da474983f888e7a..210810801a5c2081cc80243ea11e7fab4950b385 100644
--- a/src/core/SkBlitMask_D32.cpp
+++ b/src/core/SkBlitMask_D32.cpp
@@ -147,13 +147,13 @@ SkBlitMask::ColorProc SkBlitMask::ColorFactory(SkColorType ct,
     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;

[robertphillips, 2015/06/09 18:17:37]

Shouldn't this be writableAddr32 ?

[reed1, 2015/06/09 18:34:10]

foo
writable_foo

This is a somewhat common pattern, specifically for writable variants of foo
(see SkData, SkString, SkCachedData, SkRegion)

-        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;
     }