Extract most of the mutable state of SkShader into a separate Context object.

src/effects/gradients/SkGradientShaderPriv.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGradientShaderPriv_DEFINED
 #define SkGradientShaderPriv_DEFINED
 
@@ skipping 83 matching lines @@
         int                 fCount;
         SkShader::TileMode  fTileMode;
         SkUnitMapper*       fMapper;
         uint32_t            fFlags;
     };
 
 public:
     SkGradientShaderBase(const Descriptor& desc);
     virtual ~SkGradientShaderBase();
 
-    virtual bool setContext(const SkBitmap&, const SkPaint&, const SkMatrix&) SK_OVERRIDE;
-    virtual uint32_t getFlags() SK_OVERRIDE { return fFlags; }
+    class GradientShaderCache {
+    public:
+        GradientShaderCache(U8CPU alpha);
+        ~GradientShaderCache();
+
+        const uint16_t*     getCache16(const SkGradientShaderBase& shader);
+        const SkPMColor*    getCache32(const SkGradientShaderBase& shader);
+
+        SkMallocPixelRef* getCache32PixelRef() const { return fCache32PixelRef; }
+    private:
+        uint16_t*   fCache16;   // working ptr. If this is NULL, we need to recompute the cache values
+        SkPMColor*  fCache32;   // working ptr. If this is NULL, we need to recompute the cache values
+
+        uint16_t*   fCache16Storage;    // storage for fCache16, allocated on demand
+        SkMallocPixelRef* fCache32PixelRef;
+        unsigned    fCacheAlpha;        // the alpha value we used when we computed the cache.
+                                        // larger than 8bits so we can store uninitialized value
+
+        static void Build16bitCache(uint16_t[], SkColor c0, SkColor c1, int count);
+        static void Build32bitCache(SkPMColor[], SkColor c0, SkColor c1, int count,
+                                    U8CPU alpha, uint32_t gradFlags);
+    };
+
+    virtual bool validContext(const SkBitmap& device, const SkPaint& paint, const SkMatrix& matrix,
+                              SkMatrix* totalInverse = NULL) const SK_OVERRIDE;
+    // TODO(dominikg): DELETE
+    virtual SkShader::Context* createContext(const SkBitmap&, const SkPaint&, const SkMatrix&,
+                                             void* storage) const SK_OVERRIDE { return NULL; }
+    virtual size_t contextSize() const SK_OVERRIDE;
+
+    class GradientShaderBaseContext : public SkShader::Context {
+    public:
+        GradientShaderBaseContext(const SkGradientShaderBase& shader, const SkBitmap& device,
+                                  const SkPaint& paint, const SkMatrix& matrix);
+        ~GradientShaderBaseContext() {}
+    protected:
+        SkMatrix    fDstToIndex;
+        SkMatrix::MapXYProc fDstToIndexProc;
+        uint8_t     fDstToIndexClass;
+        uint8_t     fFlags;
+
+        GradientShaderCache fCache;
+
+        typedef SkShader::Context INHERITED;
+    };
+
     virtual bool isOpaque() const SK_OVERRIDE;
 
     void getGradientTableBitmap(SkBitmap*) const;
 
     enum {
         /// Seems like enough for visual accuracy. TODO: if pos[] deserves
         /// it, use a larger cache.
         kCache16Bits    = 8,
         kCache16Count = (1 << kCache16Bits),
         kCache16Shift   = 16 - kCache16Bits,
@@ skipping 13 matching lines @@
     };
 
 
 protected:
     SkGradientShaderBase(SkReadBuffer& );
     virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
     SK_DEVELOPER_TO_STRING()
 
     SkUnitMapper* fMapper;
     SkMatrix    fPtsToUnit;     // set by subclass
-    SkMatrix    fDstToIndex;
-    SkMatrix::MapXYProc fDstToIndexProc;
     TileMode    fTileMode;
     TileProc    fTileProc;
     int         fColorCount;
-    uint8_t     fDstToIndexClass;
-    uint8_t     fFlags;
     uint8_t     fGradFlags;
 
     struct Rec {
         SkFixed     fPos;   // 0...1
         uint32_t    fScale; // (1 << 24) / range
     };
     Rec*        fRecs;
 
-    const uint16_t*     getCache16() const;
-    const SkPMColor*    getCache32() const;
-
     void commonAsAGradient(GradientInfo*) const;
 
 private:
     enum {
         kColorStorageCount = 4, // more than this many colors, and we'll use sk_malloc for the space
 
         kStorageSize = kColorStorageCount * (sizeof(SkColor) + sizeof(Rec))
     };
     SkColor     fStorage[(kStorageSize + 3) >> 2];
     SkColor*    fOrigColors; // original colors, before modulation by paint in setContext
     bool        fColorsAreOpaque;
 
-    mutable uint16_t*   fCache16;   // working ptr. If this is NULL, we need to recompute the cache values
-    mutable SkPMColor*  fCache32;   // working ptr. If this is NULL, we need to recompute the cache values
-
-    mutable uint16_t*   fCache16Storage;    // storage for fCache16, allocated on demand
-    mutable SkMallocPixelRef* fCache32PixelRef;
-    mutable unsigned    fCacheAlpha;        // the alpha value we used when we computed the cache. larger than 8bits so we can store uninitialized value
-
-    static void Build16bitCache(uint16_t[], SkColor c0, SkColor c1, int count);
-    static void Build32bitCache(SkPMColor[], SkColor c0, SkColor c1, int count,
-                                U8CPU alpha, uint32_t gradFlags);
-    void setCacheAlpha(U8CPU alpha) const;
     void initCommon();
 
     typedef SkShader INHERITED;
 };
 
 static inline int init_dither_toggle(int x, int y) {
     x &= 1;
     y = (y & 1) << 1;
     return (x | y) * SkGradientShaderBase::kDitherStride32;
 }
@@ skipping 191 matching lines @@
     GrGLUniformManager::UniformHandle fColorStartUni;
     GrGLUniformManager::UniformHandle fColorMidUni;
     GrGLUniformManager::UniformHandle fColorEndUni;
 
     typedef GrGLEffect INHERITED;
 };
 
 #endif
 
 #endif