Index: src/core/SkBitmapProcState.h |
diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h |
index 5c6a4152fc285dd9c92fedc65f8e727f8bb920dc..2d63775b1c0fcf90b0f58f89e8bf2a8698f1ae33 100644 |
--- a/src/core/SkBitmapProcState.h |
+++ b/src/core/SkBitmapProcState.h |
@@ -33,11 +33,8 @@ |
class SkPaint; |
struct SkBitmapProcState { |
- |
+ |
SkBitmapProcState(): fBitmapFilter(NULL) {} |
- ~SkBitmapProcState() { |
- SkDELETE(fBitmapFilter); |
- } |
typedef void (*ShaderProc32)(const SkBitmapProcState&, int x, int y, |
SkPMColor[], int count); |
@@ -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,16 +150,17 @@ private: |
SkMatrix fUnitInvMatrix; // chooseProcs |
SkBitmap fOrigBitmap; // CONSTRUCTOR |
- SkBitmap fMipBitmap; |
+ SkBitmap fScaledBitmap; // chooseProcs |
MatrixProc chooseMatrixProc(bool trivial_matrix); |
bool chooseProcs(const SkMatrix& inv, const SkPaint&); |
ShaderProc32 chooseShaderProc32(); |
+ |
+ void possiblyScaleImage(); |
- 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(); |