Working plumb of image scaling:

src/core/SkBitmapProcState.h

Index: src/core/SkBitmapProcState.h
diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h
index 5c6a4152fc285dd9c92fedc65f8e727f8bb920dc..f6b57a017b29e39722e9507975d77bc787f59b9f 100644
--- a/src/core/SkBitmapProcState.h
+++ b/src/core/SkBitmapProcState.h
@@ -33,11 +33,8 @@
 class SkPaint;
 
 struct SkBitmapProcState {
-
+    

[reed1, 2013/07/11 15:43:42]

Why this WS change?

     SkBitmapProcState(): fBitmapFilter(NULL) {}
-    ~SkBitmapProcState() {
-        SkDELETE(fBitmapFilter);
-    }
 
     typedef void (*ShaderProc32)(const SkBitmapProcState&, int x, int y,
                                  SkPMColor[], int count);
@@ -64,7 +61,7 @@ struct SkBitmapProcState {
     typedef U16CPU (*FixedTileLowBitsProc)(SkFixed, int);   // returns 0..0xF
     typedef U16CPU (*IntTileProc)(int value, int count);   // returns 0..count-1
 
-    const SkBitmap*     fBitmap;            // chooseProcs - orig or mip
+    SkBitmap*           fBitmap;            // chooseProcs - orig or mip

[reed1, 2013/07/11 15:43:42]

why is this non-const now?

[humper, 2013/07/11 16:04:09]

constness reinstated due to some code-reorg

     const SkMatrix*     fInvMatrix;         // chooseProcs
     SkMatrix::MapXYProc fInvProc;           // chooseProcs
 
@@ -86,7 +83,18 @@ struct SkBitmapProcState {
     uint8_t             fInvType;           // chooseProcs
     uint8_t             fTileModeX;         // CONSTRUCTOR
     uint8_t             fTileModeY;         // CONSTRUCTOR
-    SkBool8             fDoFilter;          // chooseProcs
+    
+    enum { 
+        kNone_BitmapFilter, 
+        kBilerp_BitmapFilter, 
+        kHQ_BitmapFilter
+    } fFilterQuality;          // chooseProcs
+
+    /** The shader will let us know when we can release some of our resources
+      * like scaled bitmaps.
+      */
+
+    void endContext();
 
     /** Platforms implement this, and can optionally overwrite only the
         following fields:
@@ -142,6 +150,7 @@ private:
 
     SkMatrix            fUnitInvMatrix;     // chooseProcs
     SkBitmap            fOrigBitmap;        // CONSTRUCTOR
+    SkBitmap            fScaledBitmap;      // chooseProcs

[reed1, 2013/07/11 15:43:42]

Do we ever need both fScaledBitmap and fMipMitmap? I wonder if we can drop
fMipBitmap, and always use the former when we need a "scaled" version of the
input?

[humper, 2013/07/11 16:04:09]

Good point; I nuked the mip one.

     SkBitmap            fMipBitmap;
 
     MatrixProc chooseMatrixProc(bool trivial_matrix);
@@ -151,7 +160,7 @@ private:
     void buildFilterCoefficients(SkFixed dst[4], float t) const;
     SkBitmapFilter *fBitmapFilter;
 
-    ShaderProc32 chooseBitmapFilterProc(const SkPaint &paint);
+    ShaderProc32 chooseBitmapFilterProc();
 
     // Return false if we failed to setup for fast translate (e.g. overflow)
     bool setupForTranslate();