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

src/core/SkCoreBlitters.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.
  */
 
 #ifndef SkCoreBlitters_DEFINED
 #define SkCoreBlitters_DEFINED
 
 #include "SkBitmapProcShader.h"
 #include "SkBlitter.h"
 #include "SkBlitRow.h"
 #include "SkShader.h"
 #include "SkSmallAllocator.h"
 
 class SkRasterBlitter : public SkBlitter {
 public:
-    SkRasterBlitter(const SkPixmap& device) : fDevice(device) {}
+    SkRasterBlitter(const SkBitmap& device) : fDevice(device) {}
 
 protected:
-    const SkPixmap fDevice;
+    const SkBitmap& fDevice;
 
 private:
     typedef SkBlitter INHERITED;
 };
 
 class SkShaderBlitter : public SkRasterBlitter {
 public:
     /**
       *  The storage for shaderContext is owned by the caller, but the object itself is not.
       *  The blitter only ensures that the storage always holds a live object, but it may
       *  exchange that object.
       */
-    SkShaderBlitter(const SkPixmap& device, const SkPaint& paint,
+    SkShaderBlitter(const SkBitmap& device, const SkPaint& paint,
                     SkShader::Context* shaderContext);
     virtual ~SkShaderBlitter();
 
     /**
       *  Create a new shader context and uses it instead of the old one if successful.
       *  Will create the context at the same location as the old one (this is safe
       *  because the shader itself is unchanged).
       */
     bool resetShaderContext(const SkShader::ContextRec&) override;
 
     SkShader::Context* getShaderContext() const override { return fShaderContext; }
 
 protected:
     uint32_t            fShaderFlags;
     const SkShader*     fShader;
     SkShader::Context*  fShaderContext;
 
 private:
     // illegal
     SkShaderBlitter& operator=(const SkShaderBlitter&);
 
     typedef SkRasterBlitter INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkA8_Coverage_Blitter : public SkRasterBlitter {
 public:
-    SkA8_Coverage_Blitter(const SkPixmap& device, const SkPaint& paint);
+    SkA8_Coverage_Blitter(const SkBitmap& device, const SkPaint& paint);
     void blitH(int x, int y, int width) override;
     void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) override;
     void blitV(int x, int y, int height, SkAlpha alpha) override;
     void blitRect(int x, int y, int width, int height) override;
     void blitMask(const SkMask&, const SkIRect&) override;
-    const SkPixmap* justAnOpaqueColor(uint32_t*) override;
+    const SkBitmap* justAnOpaqueColor(uint32_t*) override;
 };
 
 class SkA8_Blitter : public SkRasterBlitter {
 public:
-    SkA8_Blitter(const SkPixmap& device, const SkPaint& paint);
+    SkA8_Blitter(const SkBitmap& device, const SkPaint& paint);
     virtual void blitH(int x, int y, int width);
     virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]);
     virtual void blitV(int x, int y, int height, SkAlpha alpha);
     virtual void blitRect(int x, int y, int width, int height);
     virtual void blitMask(const SkMask&, const SkIRect&);
-    virtual const SkPixmap* justAnOpaqueColor(uint32_t*);
+    virtual const SkBitmap* justAnOpaqueColor(uint32_t*);
 
 private:
     unsigned fSrcA;
 
     // illegal
     SkA8_Blitter& operator=(const SkA8_Blitter&);
 
     typedef SkRasterBlitter INHERITED;
 };
 
 class SkA8_Shader_Blitter : public SkShaderBlitter {
 public:
-    SkA8_Shader_Blitter(const SkPixmap& device, const SkPaint& paint,
+    SkA8_Shader_Blitter(const SkBitmap& device, const SkPaint& paint,
                         SkShader::Context* shaderContext);
     virtual ~SkA8_Shader_Blitter();
     virtual void blitH(int x, int y, int width);
     virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]);
     virtual void blitMask(const SkMask&, const SkIRect&);
 
 private:
     SkXfermode* fXfermode;
     SkPMColor*  fBuffer;
     uint8_t*    fAAExpand;
 
     // illegal
     SkA8_Shader_Blitter& operator=(const SkA8_Shader_Blitter&);
 
     typedef SkShaderBlitter INHERITED;
 };
 
 ////////////////////////////////////////////////////////////////
 
 class SkARGB32_Blitter : public SkRasterBlitter {
 public:
-    SkARGB32_Blitter(const SkPixmap& device, const SkPaint& paint);
+    SkARGB32_Blitter(const SkBitmap& device, const SkPaint& paint);
     virtual void blitH(int x, int y, int width);
     virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]);
     virtual void blitV(int x, int y, int height, SkAlpha alpha);
     virtual void blitRect(int x, int y, int width, int height);
     virtual void blitMask(const SkMask&, const SkIRect&);
-    virtual const SkPixmap* justAnOpaqueColor(uint32_t*);
+    virtual const SkBitmap* justAnOpaqueColor(uint32_t*);
     void blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) override;
     void blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) override;
 
 protected:
     SkColor                fColor;
     SkPMColor              fPMColor;
 
 private:
     unsigned fSrcA, fSrcR, fSrcG, fSrcB;
 
     // illegal
     SkARGB32_Blitter& operator=(const SkARGB32_Blitter&);
 
     typedef SkRasterBlitter INHERITED;
 };
 
 class SkARGB32_Opaque_Blitter : public SkARGB32_Blitter {
 public:
-    SkARGB32_Opaque_Blitter(const SkPixmap& device, const SkPaint& paint)
+    SkARGB32_Opaque_Blitter(const SkBitmap& device, const SkPaint& paint)
         : INHERITED(device, paint) { SkASSERT(paint.getAlpha() == 0xFF); }
     virtual void blitMask(const SkMask&, const SkIRect&);
     void blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) override;
     void blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) override;
 
 private:
     typedef SkARGB32_Blitter INHERITED;
 };
 
 class SkARGB32_Black_Blitter : public SkARGB32_Opaque_Blitter {
 public:
-    SkARGB32_Black_Blitter(const SkPixmap& device, const SkPaint& paint)
+    SkARGB32_Black_Blitter(const SkBitmap& device, const SkPaint& paint)
         : INHERITED(device, paint) {}
     virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]);
     void blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) override;
     void blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) override;
 
 private:
     typedef SkARGB32_Opaque_Blitter INHERITED;
 };
 
 class SkARGB32_Shader_Blitter : public SkShaderBlitter {
 public:
-    SkARGB32_Shader_Blitter(const SkPixmap& device, const SkPaint& paint,
+    SkARGB32_Shader_Blitter(const SkBitmap& device, const SkPaint& paint,
                             SkShader::Context* shaderContext);
     virtual ~SkARGB32_Shader_Blitter();
     void blitH(int x, int y, int width) override;
     void blitV(int x, int y, int height, SkAlpha alpha) override;
     void blitRect(int x, int y, int width, int height) override;
     void blitAntiH(int x, int y, const SkAlpha[], const int16_t[]) override;
     void blitMask(const SkMask&, const SkIRect&) override;
 
 private:
     SkXfermode*         fXfermode;
@@ skipping 17 matching lines @@
     paint:
 
     1. If there is an xfermode, there will also be a shader
     2. If there is a colorfilter, there will be a shader that itself handles
        calling the filter, so the blitter can always ignore the colorfilter obj
 
     These pre-conditions must be handled by the caller, in our case
     SkBlitter::Choose(...)
  */
 
-SkBlitter* SkBlitter_ChooseD565(const SkPixmap& device, const SkPaint& paint,
+SkBlitter* SkBlitter_ChooseD565(const SkBitmap& device, const SkPaint& paint,
                                 SkShader::Context* shaderContext,
                                 SkTBlitterAllocator* allocator);
 
 #endif