Revert of change SkDraw and all Blitters to use pixmap instead of bitmap

src/core/SkBlitBWMaskTemplate.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBitmap.h"
 #include "SkMask.h"
 
 #ifndef ClearLow3Bits_DEFINED
 #define ClearLow3Bits_DEFINED
     #define ClearLow3Bits(x)    ((unsigned)(x) >> 3 << 3)
 #endif
 
 /*
     SK_BLITBWMASK_NAME          name of function(const SkBitmap& bitmap, const SkMask& mask, const SkIRect& clip, SK_BLITBWMASK_ARGS)
     SK_BLITBWMASK_ARGS          list of additional arguments to SK_BLITBWMASK_NAME, beginning with a comma
     SK_BLITBWMASK_BLIT8         name of function(U8CPU byteMask, SK_BLITBWMASK_DEVTYPE* dst, int x, int y)
-    SK_BLITBWMASK_GETADDR       either writable_addr[8,16,32]
+    SK_BLITBWMASK_GETADDR       either getAddr32 or getAddr16 or getAddr8
     SK_BLITBWMASK_DEVTYPE       either U32 or U16 or U8
 */
 
-static void SK_BLITBWMASK_NAME(const SkPixmap& dst, const SkMask& srcMask,
-                               const SkIRect& clip SK_BLITBWMASK_ARGS) {
+static void SK_BLITBWMASK_NAME(const SkBitmap& bitmap, const SkMask& srcMask, const SkIRect& clip SK_BLITBWMASK_ARGS)
+{
     SkASSERT(clip.fRight <= srcMask.fBounds.fRight);
 
     int cx = clip.fLeft;
     int cy = clip.fTop;
     int maskLeft = srcMask.fBounds.fLeft;
     unsigned mask_rowBytes = srcMask.fRowBytes;
-    size_t bitmap_rowBytes = dst.rowBytes();
+    size_t bitmap_rowBytes = bitmap.rowBytes();
     unsigned height = clip.height();
 
     SkASSERT(mask_rowBytes != 0);
     SkASSERT(bitmap_rowBytes != 0);
     SkASSERT(height != 0);
 
     const uint8_t* bits = srcMask.getAddr1(cx, cy);
-    SK_BLITBWMASK_DEVTYPE* device = dst.SK_BLITBWMASK_GETADDR(cx, cy);
+    SK_BLITBWMASK_DEVTYPE* device = bitmap.SK_BLITBWMASK_GETADDR(cx, cy);
 
     if (cx == maskLeft && clip.fRight == srcMask.fBounds.fRight)
     {
         do {
             SK_BLITBWMASK_DEVTYPE* dst = device;
             unsigned rb = mask_rowBytes;
             do {
                 U8CPU mask = *bits++;
                 SK_BLITBWMASK_BLIT8(mask, dst);
                 dst += 8;
@@ skipping 66 matching lines @@
         }
     }
 }
 
 #undef SK_BLITBWMASK_NAME
 #undef SK_BLITBWMASK_ARGS
 #undef SK_BLITBWMASK_BLIT8
 #undef SK_BLITBWMASK_GETADDR
 #undef SK_BLITBWMASK_DEVTYPE
 #undef SK_BLITBWMASK_DOROWSETUP