remove bitmaps entirely from sprite blits (as source)

src/core/SkSpriteBlitterTemplate.h

Index: src/core/SkSpriteBlitterTemplate.h
diff --git a/src/core/SkSpriteBlitterTemplate.h b/src/core/SkSpriteBlitterTemplate.h
index 0243e4f28a0eb1f7ee7c27059607d735255f3da4..3806dbcd31fc0ee2b6aa73889c60746ad881ed16 100644
--- a/src/core/SkSpriteBlitterTemplate.h
+++ b/src/core/SkSpriteBlitterTemplate.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,12 +5,9 @@
  * found in the LICENSE file.
  */
 
-
-
 class SkSPRITE_CLASSNAME : public SkSpriteBlitter {
 public:
-    SkSPRITE_CLASSNAME(const SkBitmap& source SkSPRITE_ARGS)
-        : SkSpriteBlitter(source) {
+    SkSPRITE_CLASSNAME(const SkPixmap& source SkSPRITE_ARGS) : SkSpriteBlitter(source) {
         SkSPRITE_INIT
     }
 
@@ -20,15 +16,14 @@ public:
         int srcX = x - fLeft;
         int srcY = y - fTop;
         SkSPRITE_DST_TYPE* SK_RESTRICT dst =fDevice->SkSPRITE_DST_GETADDR(x, y);
-        const SkSPRITE_SRC_TYPE* SK_RESTRICT src =
-                                      fSource->SkSPRITE_SRC_GETADDR(srcX, srcY);
+        const SkSPRITE_SRC_TYPE* SK_RESTRICT src = fSource.SkSPRITE_SRC_GETADDR(srcX, srcY);
         size_t dstRB = fDevice->rowBytes();
-        size_t srcRB = fSource->rowBytes();
+        size_t srcRB = fSource.rowBytes();
 
         SkDEBUGCODE((void)fDevice->SkSPRITE_DST_GETADDR(x + width - 1, y + height - 1);)
-        SkDEBUGCODE((void)fSource->SkSPRITE_SRC_GETADDR(srcX + width  - 1, srcY + height - 1);)
+        SkDEBUGCODE((void)fSource.SkSPRITE_SRC_GETADDR(srcX + width  - 1, srcY + height - 1);)
 
-        SkSPRITE_PREAMBLE((*fSource), srcX, srcY);
+        SkSPRITE_PREAMBLE(fSource, srcX, srcY);
 
         do {
             SkSPRITE_DST_TYPE* d = dst;
@@ -48,8 +43,7 @@ public:
             } while (--w != 0);
 #endif
             dst = (SkSPRITE_DST_TYPE* SK_RESTRICT)((char*)dst + dstRB);
-            src = (const SkSPRITE_SRC_TYPE* SK_RESTRICT)
-                                            ((const char*)src + srcRB);
+            src = (const SkSPRITE_SRC_TYPE* SK_RESTRICT)((const char*)src + srcRB);
             SkSPRITE_NEXT_ROW
 #ifdef SkSPRITE_ROW_PROC
             y += 1;