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

src/core/SkAAClip.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkAAClip_DEFINED
 #define SkAAClip_DEFINED
@@ skipping 92 matching lines @@
     virtual ~SkAAClipBlitter();
 
     void init(SkBlitter* blitter, const SkAAClip* aaclip) {
         SkASSERT(aaclip && !aaclip->isEmpty());
         fBlitter = blitter;
         fAAClip = aaclip;
         fAAClipBounds = aaclip->getBounds();
     }
 
     void blitH(int x, int y, int width) override;
-    void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) override;
+    virtual void blitAntiH(int x, int y, const SkAlpha[],
+                           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& clip) override;
-    const SkPixmap* justAnOpaqueColor(uint32_t* value) override;
+    const SkBitmap* justAnOpaqueColor(uint32_t* value) override;
 
 private:
     SkBlitter*      fBlitter;
     const SkAAClip* fAAClip;
     SkIRect         fAAClipBounds;
 
     // point into fScanlineScratch
     int16_t*        fRuns;
     SkAlpha*        fAA;
 
     enum {
         kSize = 32 * 32
     };
     SkAutoSMalloc<kSize> fGrayMaskScratch;  // used for blitMask
     void* fScanlineScratch;  // enough for a mask at 32bit, or runs+aa
 
     void ensureRunsAndAA();
 };
 
 #endif