Work (in progress) to make SkShader immutable.

src/core/SkCoreBlitters.h

Index: src/core/SkCoreBlitters.h
diff --git a/src/core/SkCoreBlitters.h b/src/core/SkCoreBlitters.h
index 285184050ba88737b3b94391812a5af246e5da31..eaf63577f93c6e4a41e8250aae032a9272134bf5 100644
--- a/src/core/SkCoreBlitters.h
+++ b/src/core/SkCoreBlitters.h
@@ -27,12 +27,13 @@ private:
 
 class SkShaderBlitter : public SkRasterBlitter {
 public:
-    SkShaderBlitter(const SkBitmap& device, const SkPaint& paint);
+    SkShaderBlitter(const SkBitmap& device, const SkPaint& paint,
+                    SkShaderGenerator::ShaderImpl* shaderImpl);
     virtual ~SkShaderBlitter();
 
 protected:
-    uint32_t    fShaderFlags;
-    SkShader*   fShader;
+    uint32_t                        fShaderFlags;
+    SkShaderGenerator::ShaderImpl*  fShader;
 
 private:
     // illegal
@@ -75,7 +76,8 @@ private:
 
 class SkA8_Shader_Blitter : public SkShaderBlitter {
 public:
-    SkA8_Shader_Blitter(const SkBitmap& device, const SkPaint& paint);
+    SkA8_Shader_Blitter(const SkBitmap& device, const SkPaint& paint,
+                        SkShaderGenerator::ShaderImpl* shaderImpl);
     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[]);
@@ -141,7 +143,8 @@ private:
 
 class SkARGB32_Shader_Blitter : public SkShaderBlitter {
 public:
-    SkARGB32_Shader_Blitter(const SkBitmap& device, const SkPaint& paint);
+    SkARGB32_Shader_Blitter(const SkBitmap& device, const SkPaint& paint,
+                            SkShaderGenerator::ShaderImpl* shaderImpl);
     virtual ~SkARGB32_Shader_Blitter();
     virtual void blitH(int x, int y, int width) SK_OVERRIDE;
     virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
@@ -179,6 +182,7 @@ private:
  */
 
 SkBlitter* SkBlitter_ChooseD565(const SkBitmap& device, const SkPaint& paint,
+                                SkShaderGenerator::ShaderImpl* shaderImpl,
                                 SkTBlitterAllocator* allocator);
 
 #endif