change SkDraw and all Blitters to use pixmap instead of bitmap

BUG=skia:

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

1 files changed, 7 insertions, 8 deletions

diff --git a/src/core/SkDeviceLooper.h b/src/core/SkDeviceLooper.h
index a218345ae8..dd346d7445 100644
--- a/src/core/SkDeviceLooper.h
+++ b/src/core/SkDeviceLooper.h
@@ -30,14 +30,13 @@
  */
 class SkDeviceLooper {
 public:
-    SkDeviceLooper(const SkBitmap& base, const SkRasterClip&,
-                   const SkIRect& bounds, bool aa);
+    SkDeviceLooper(const SkPixmap& base, const SkRasterClip&, const SkIRect& bounds, bool aa);
     ~SkDeviceLooper();
 
-    const SkBitmap& getBitmap() const {
+    const SkPixmap& getPixmap() const {
         SkASSERT(kDone_State != fState);
-        SkASSERT(fCurrBitmap);
-        return *fCurrBitmap;
+        SkASSERT(fCurrDst);
+        return *fCurrDst;
     }
 
     const SkRasterClip& getRC() const {
@@ -61,7 +60,7 @@ public:
     bool next();
 
 private:
-    const SkBitmap&     fBaseBitmap;
+    const SkPixmap&     fBaseDst;
     const SkRasterClip& fBaseRC;
 
     enum State {
@@ -71,10 +70,10 @@ private:
     };
 
     // storage for our tiled versions. Perhaps could use SkTLazy
-    SkBitmap            fSubsetBitmap;
+    SkPixmap            fSubsetDst;
     SkRasterClip        fSubsetRC;
 
-    const SkBitmap*     fCurrBitmap;
+    const SkPixmap*     fCurrDst;
     const SkRasterClip* fCurrRC;
     SkIRect             fClippedBounds;
     SkIPoint            fCurrOffset;