Renamed and made public SkGradientShaderBases's 'commonAsAGradient' to 'getGradientTableBitmap', and use that instead of asABitmap in gradient custom stage setup.

Also tidied up Gr gradient implementation constructors, to take the appropriate SkGradientShaderBase subclass, and where necessary (namely 2pt radial/conical) made them obtain extra parameters from that object, rather than passing them in in addition to it.
Review URL: https://codereview.appspot.com/6449057

git-svn-id: http://skia.googlecode.com/svn/trunk@4808 2bbb7eff-a529-9590-31e7-b0007b416f81

12 files changed, 318 insertions, 314 deletions

diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index f5f3f5b6b9..6bec70f839 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -483,7 +483,7 @@ const SkPMColor* SkGradientShaderBase::getCache32() const {
  *  colors and positions. Note: we don't try to flatten the fMapper, so if one
  *  is present, we skip the cache for now.
  */
-void SkGradientShaderBase::commonAsABitmap(SkBitmap* bitmap) const {
+void SkGradientShaderBase::getGradientTableBitmap(SkBitmap* bitmap) const {
     // our caller assumes no external alpha, so we ensure that our cache is
     // built with 0xFF
     this->setCacheAlpha(0xFF);
@@ -689,23 +689,23 @@ void GrGLGradientStage::emitColorLookup(GrGLShaderBuilder* builder,
 /////////////////////////////////////////////////////////////////////
 
 GrGradientEffect::GrGradientEffect(GrTexture* texture) 
-                                   : fTexture (texture)
-                                   , fUseTexture(true) {
+    : fTexture (texture)
+    , fUseTexture(true) {
     SkSafeRef(fTexture);
 }
 
 GrGradientEffect::GrGradientEffect(GrContext* ctx, 
-                                   const SkShader& shader,
+                                   const SkGradientShaderBase& shader,
                                    GrSamplerState* sampler)
-                                   : fTexture (NULL)
-                                   , fUseTexture (false) {
+    : fTexture (NULL)
+    , fUseTexture (false) {
     // TODO: check for simple cases where we don't need a texture:
     //GradientInfo info;
     //shader.asAGradient(&info);
     //if (info.fColorCount == 2) { ...
 
     SkBitmap bitmap;
-    shader.asABitmap(&bitmap, NULL, NULL);
+    shader.getGradientTableBitmap(&bitmap);
 
     GrContext::TextureCacheEntry entry = GrLockCachedBitmapTexture(ctx, bitmap,
                                                                    sampler->textureParams());
diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h
index 23de48cdf9..93b8c8358f 100644
--- a/src/effects/gradients/SkGradientShaderPriv.h
+++ b/src/effects/gradients/SkGradientShaderPriv.h
@@ -1,264 +1,267 @@
-

-/*

- * 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

-

-#include "SkGradientShader.h"

-#include "SkClampRange.h"

-#include "SkColorPriv.h"

-#include "SkMallocPixelRef.h"

-#include "SkUnitMapper.h"

-#include "SkUtils.h"

-#include "SkTemplates.h"

-#include "SkBitmapCache.h"

-#include "SkShader.h"

-#include "GrSamplerState.h"

-#include "SkGr.h"

-#include "gl/GrGLProgramStage.h"

-

-#ifndef SK_DISABLE_DITHER_32BIT_GRADIENT

-    #define USE_DITHER_32BIT_GRADIENT

-#endif

-

-static void sk_memset32_dither(uint32_t dst[], uint32_t v0, uint32_t v1,

-                               int count) {

-    if (count > 0) {

-        if (v0 == v1) {

-            sk_memset32(dst, v0, count);

-        } else {

-            int pairs = count >> 1;

-            for (int i = 0; i < pairs; i++) {

-                *dst++ = v0;

-                *dst++ = v1;

-            }

-            if (count & 1) {

-                *dst = v0;

-            }

-        }

-    }

-}

-

-//  Clamp

-

-static SkFixed clamp_tileproc(SkFixed x) {

-    return SkClampMax(x, 0xFFFF);

-}

-

-// Repeat

-

-static SkFixed repeat_tileproc(SkFixed x) {

-    return x & 0xFFFF;

-}

-

-// Mirror

-

-// Visual Studio 2010 (MSC_VER=1600) optimizes bit-shift code incorrectly.

-// See http://code.google.com/p/skia/issues/detail?id=472

-#if defined(_MSC_VER) && (_MSC_VER >= 1600)

-#pragma optimize("", off)

-#endif

-

-static inline SkFixed mirror_tileproc(SkFixed x) {

-    int s = x << 15 >> 31;

-    return (x ^ s) & 0xFFFF;

-}

-

-#if defined(_MSC_VER) && (_MSC_VER >= 1600)

-#pragma optimize("", on)

-#endif

-

-///////////////////////////////////////////////////////////////////////////////

-

-typedef SkFixed (*TileProc)(SkFixed);

-

-///////////////////////////////////////////////////////////////////////////////

-

-static const TileProc gTileProcs[] = {

-    clamp_tileproc,

-    repeat_tileproc,

-    mirror_tileproc

-};

-

-///////////////////////////////////////////////////////////////////////////////

-

-class SkGradientShaderBase : public SkShader {

-public:

-    SkGradientShaderBase(const SkColor colors[], const SkScalar pos[],

-                int colorCount, SkShader::TileMode mode, SkUnitMapper* mapper);

-    virtual ~SkGradientShaderBase();

-

-    // overrides

-    virtual bool setContext(const SkBitmap&, const SkPaint&, const SkMatrix&) SK_OVERRIDE;

-    virtual uint32_t getFlags() SK_OVERRIDE { return fFlags; }

-    virtual bool isOpaque() const SK_OVERRIDE;

-

-    enum {

-        /// Seems like enough for visual accuracy. TODO: if pos[] deserves

-        /// it, use a larger cache.

-        kCache16Bits    = 8,

-        kGradient16Length = (1 << kCache16Bits),

-        /// Each cache gets 1 extra entry at the end so we don't have to

-        /// test for end-of-cache in lerps. This is also the value used

-        /// to stride *writes* into the dither cache; it must not be zero.

-        /// Total space for a cache is 2x kCache16Count entries: one

-        /// regular cache, one for dithering.

-        kCache16Count   = kGradient16Length + 1,

-        kCache16Shift   = 16 - kCache16Bits,

-        kSqrt16Shift    = 8 - kCache16Bits,

-

-        /// Seems like enough for visual accuracy. TODO: if pos[] deserves

-        /// it, use a larger cache.

-        kCache32Bits    = 8,

-        kGradient32Length = (1 << kCache32Bits),

-        /// Each cache gets 1 extra entry at the end so we don't have to

-        /// test for end-of-cache in lerps. This is also the value used

-        /// to stride *writes* into the dither cache; it must not be zero.

-        /// Total space for a cache is 2x kCache32Count entries: one

-        /// regular cache, one for dithering.

-        kCache32Count   = kGradient32Length + 1,

-        kCache32Shift   = 16 - kCache32Bits,

-        kSqrt32Shift    = 8 - kCache32Bits,

-

-        /// This value is used to *read* the dither cache; it may be 0

-        /// if dithering is disabled.

-#ifdef USE_DITHER_32BIT_GRADIENT

-        kDitherStride32 = kCache32Count,

-#else

-        kDitherStride32 = 0,

-#endif

-        kDitherStride16 = kCache16Count,

-        kLerpRemainderMask32 = (1 << (16 - kCache32Bits)) - 1

-    };

-

-

-protected:

-    SkGradientShaderBase(SkFlattenableReadBuffer& );

-    virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;

-

-    SkUnitMapper* fMapper;

-    SkMatrix    fPtsToUnit;     // set by subclass

-    SkMatrix    fDstToIndex;

-    SkMatrix::MapXYProc fDstToIndexProc;

-    TileMode    fTileMode;

-    TileProc    fTileProc;

-    int         fColorCount;

-    uint8_t     fDstToIndexClass;

-    uint8_t     fFlags;

-

-    struct Rec {

-        SkFixed     fPos;   // 0...1

-        uint32_t    fScale; // (1 << 24) / range

-    };

-    Rec*        fRecs;

-

-    const uint16_t*     getCache16() const;

-    const SkPMColor*    getCache32() const;

-

-    void commonAsABitmap(SkBitmap*) 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);

-    void setCacheAlpha(U8CPU alpha) const;

-    void initCommon();

-

-    typedef SkShader INHERITED;

-};

-

-///////////////////////////////////////////////////////////////////////////////

-

-class GrSamplerState;

-class GrProgramStageFactory;

-

-/*

- * The intepretation of the texture matrix depends on the sample mode. The

- * texture matrix is applied both when the texture coordinates are explicit

- * and  when vertex positions are used as texture  coordinates. In the latter

- * case the texture matrix is applied to the pre-view-matrix position 

- * values.

- *

- * Normal SampleMode

- *  The post-matrix texture coordinates are in normalize space with (0,0) at

- *  the top-left and (1,1) at the bottom right.

- * RadialGradient

- *  The matrix specifies the radial gradient parameters.

- *  (0,0) in the post-matrix space is center of the radial gradient.

- * Radial2Gradient

- *   Matrix transforms to space where first circle is centered at the

- *   origin. The second circle will be centered (x, 0) where x may be 

- *   0 and is provided by setRadial2Params. The post-matrix space is 

- *   normalized such that 1 is the second radius - first radius.

- * SweepGradient

- *  The angle from the origin of texture coordinates in post-matrix space

- *  determines the gradient value.

- */

-

-// Base class for Gr gradient effects

-class GrGradientEffect : public GrCustomStage {

-public:

-

-    GrGradientEffect(GrTexture* texture);

-    GrGradientEffect(GrContext* ctx, const SkShader& shader, 

-                     GrSamplerState* sampler);

-

-    virtual ~GrGradientEffect();

-

-    unsigned int numTextures() const;

-    GrTexture* texture(unsigned int index) const;

-

-    bool useTexture() const { return fUseTexture; }

-

-private:

-

-    GrTexture* fTexture;

-    bool fUseTexture;

-

-    typedef GrCustomStage INHERITED;

-

-};

-

-///////////////////////////////////////////////////////////////////////////////

-

-// Base class for GL gradient custom stages

-class GrGLGradientStage : public GrGLProgramStage {

-public:

-

-    GrGLGradientStage(const GrProgramStageFactory& factory);

-    virtual ~GrGLGradientStage();

-

-    // emit code that gets a fragment's color from an expression for t; for now

-    // this always uses the texture, but for simpler cases we'll be able to lerp

-    void emitColorLookup(GrGLShaderBuilder* builder, const char* t, 

-                         const char* outputColor, const char* samplerName);

-

-private:

-

-    typedef GrGLProgramStage INHERITED;

-};

-

-#endif

-

+
+/*
+ * 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
+
+#include "SkGradientShader.h"
+#include "SkClampRange.h"
+#include "SkColorPriv.h"
+#include "SkMallocPixelRef.h"
+#include "SkUnitMapper.h"
+#include "SkUtils.h"
+#include "SkTemplates.h"
+#include "SkBitmapCache.h"
+#include "SkShader.h"
+#include "GrSamplerState.h"
+#include "SkGr.h"
+#include "gl/GrGLProgramStage.h"
+
+#ifndef SK_DISABLE_DITHER_32BIT_GRADIENT
+    #define USE_DITHER_32BIT_GRADIENT
+#endif
+
+static void sk_memset32_dither(uint32_t dst[], uint32_t v0, uint32_t v1,
+                               int count) {
+    if (count > 0) {
+        if (v0 == v1) {
+            sk_memset32(dst, v0, count);
+        } else {
+            int pairs = count >> 1;
+            for (int i = 0; i < pairs; i++) {
+                *dst++ = v0;
+                *dst++ = v1;
+            }
+            if (count & 1) {
+                *dst = v0;
+            }
+        }
+    }
+}
+
+//  Clamp
+
+static SkFixed clamp_tileproc(SkFixed x) {
+    return SkClampMax(x, 0xFFFF);
+}
+
+// Repeat
+
+static SkFixed repeat_tileproc(SkFixed x) {
+    return x & 0xFFFF;
+}
+
+// Mirror
+
+// Visual Studio 2010 (MSC_VER=1600) optimizes bit-shift code incorrectly.
+// See http://code.google.com/p/skia/issues/detail?id=472
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#pragma optimize("", off)
+#endif
+
+static inline SkFixed mirror_tileproc(SkFixed x) {
+    int s = x << 15 >> 31;
+    return (x ^ s) & 0xFFFF;
+}
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#pragma optimize("", on)
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+
+typedef SkFixed (*TileProc)(SkFixed);
+
+///////////////////////////////////////////////////////////////////////////////
+
+static const TileProc gTileProcs[] = {
+    clamp_tileproc,
+    repeat_tileproc,
+    mirror_tileproc
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class SkGradientShaderBase : public SkShader {
+public:
+    SkGradientShaderBase(const SkColor colors[], const SkScalar pos[],
+                int colorCount, SkShader::TileMode mode, SkUnitMapper* mapper);
+    virtual ~SkGradientShaderBase();
+
+    // overrides
+    virtual bool setContext(const SkBitmap&, const SkPaint&, const SkMatrix&) SK_OVERRIDE;
+    virtual uint32_t getFlags() SK_OVERRIDE { return fFlags; }
+    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,
+        kGradient16Length = (1 << kCache16Bits),
+        /// Each cache gets 1 extra entry at the end so we don't have to
+        /// test for end-of-cache in lerps. This is also the value used
+        /// to stride *writes* into the dither cache; it must not be zero.
+        /// Total space for a cache is 2x kCache16Count entries: one
+        /// regular cache, one for dithering.
+        kCache16Count   = kGradient16Length + 1,
+        kCache16Shift   = 16 - kCache16Bits,
+        kSqrt16Shift    = 8 - kCache16Bits,
+
+        /// Seems like enough for visual accuracy. TODO: if pos[] deserves
+        /// it, use a larger cache.
+        kCache32Bits    = 8,
+        kGradient32Length = (1 << kCache32Bits),
+        /// Each cache gets 1 extra entry at the end so we don't have to
+        /// test for end-of-cache in lerps. This is also the value used
+        /// to stride *writes* into the dither cache; it must not be zero.
+        /// Total space for a cache is 2x kCache32Count entries: one
+        /// regular cache, one for dithering.
+        kCache32Count   = kGradient32Length + 1,
+        kCache32Shift   = 16 - kCache32Bits,
+        kSqrt32Shift    = 8 - kCache32Bits,
+
+        /// This value is used to *read* the dither cache; it may be 0
+        /// if dithering is disabled.
+#ifdef USE_DITHER_32BIT_GRADIENT
+        kDitherStride32 = kCache32Count,
+#else
+        kDitherStride32 = 0,
+#endif
+        kDitherStride16 = kCache16Count,
+        kLerpRemainderMask32 = (1 << (16 - kCache32Bits)) - 1
+    };
+
+
+protected:
+    SkGradientShaderBase(SkFlattenableReadBuffer& );
+    virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+
+    SkUnitMapper* fMapper;
+    SkMatrix    fPtsToUnit;     // set by subclass
+    SkMatrix    fDstToIndex;
+    SkMatrix::MapXYProc fDstToIndexProc;
+    TileMode    fTileMode;
+    TileProc    fTileProc;
+    int         fColorCount;
+    uint8_t     fDstToIndexClass;
+    uint8_t     fFlags;
+
+    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);
+    void setCacheAlpha(U8CPU alpha) const;
+    void initCommon();
+
+    typedef SkShader INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class GrSamplerState;
+class GrProgramStageFactory;
+
+/*
+ * The intepretation of the texture matrix depends on the sample mode. The
+ * texture matrix is applied both when the texture coordinates are explicit
+ * and  when vertex positions are used as texture  coordinates. In the latter
+ * case the texture matrix is applied to the pre-view-matrix position 
+ * values.
+ *
+ * Normal SampleMode
+ *  The post-matrix texture coordinates are in normalize space with (0,0) at
+ *  the top-left and (1,1) at the bottom right.
+ * RadialGradient
+ *  The matrix specifies the radial gradient parameters.
+ *  (0,0) in the post-matrix space is center of the radial gradient.
+ * Radial2Gradient
+ *   Matrix transforms to space where first circle is centered at the
+ *   origin. The second circle will be centered (x, 0) where x may be 
+ *   0 and is provided by setRadial2Params. The post-matrix space is 
+ *   normalized such that 1 is the second radius - first radius.
+ * SweepGradient
+ *  The angle from the origin of texture coordinates in post-matrix space
+ *  determines the gradient value.
+ */
+
+// Base class for Gr gradient effects
+class GrGradientEffect : public GrCustomStage {
+public:
+
+    // FIXME: This constructor is only used in GrGpuGL_unittest.cpp, and should
+    // be removed once an alternative testing setup has been devised.
+    GrGradientEffect(GrTexture* texture);
+    GrGradientEffect(GrContext* ctx, const SkGradientShaderBase& shader, 
+                     GrSamplerState* sampler);
+
+    virtual ~GrGradientEffect();
+
+    unsigned int numTextures() const;
+    GrTexture* texture(unsigned int index) const;
+
+    bool useTexture() const { return fUseTexture; }
+
+private:
+
+    GrTexture* fTexture;
+    bool fUseTexture;
+
+    typedef GrCustomStage INHERITED;
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Base class for GL gradient custom stages
+class GrGLGradientStage : public GrGLProgramStage {
+public:
+
+    GrGLGradientStage(const GrProgramStageFactory& factory);
+    virtual ~GrGLGradientStage();
+
+    // emit code that gets a fragment's color from an expression for t; for now
+    // this always uses the texture, but for simpler cases we'll be able to lerp
+    void emitColorLookup(GrGLShaderBuilder* builder, const char* t, 
+                         const char* outputColor, const char* samplerName);
+
+private:
+
+    typedef GrGLProgramStage INHERITED;
+};
+
+#endif
+
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index cb6fdaf81b..49e93459f2 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -291,7 +291,7 @@ SkShader::BitmapType SkLinearGradient::asABitmap(SkBitmap* bitmap,
                                                 SkMatrix* matrix,
                                                 TileMode xy[]) const {
     if (bitmap) {
-        this->commonAsABitmap(bitmap);
+        this->getGradientTableBitmap(bitmap);
     }
     if (matrix) {
         matrix->preConcat(fPtsToUnit);
@@ -518,13 +518,13 @@ void GrGLLinearGradient::emitFS(GrGLShaderBuilder* builder,
 /////////////////////////////////////////////////////////////////////
 
 GrLinearGradient::GrLinearGradient(GrTexture* texture)
-                  : INHERITED(texture) { 
+    : INHERITED(texture) { 
 }
 
 GrLinearGradient::GrLinearGradient(GrContext* ctx, 
-                                   const SkShader& shader,
+                                   const SkLinearGradient& shader,
                                    GrSamplerState* sampler)
-                                   : INHERITED(ctx, shader, sampler) {
+    : INHERITED(ctx, shader, sampler) {
 }
 
 GrLinearGradient::~GrLinearGradient() {
diff --git a/src/effects/gradients/SkLinearGradient.h b/src/effects/gradients/SkLinearGradient.h
index 714bcdc5f6..c4b1b4672d 100644
--- a/src/effects/gradients/SkLinearGradient.h
+++ b/src/effects/gradients/SkLinearGradient.h
@@ -46,7 +46,7 @@ class GrLinearGradient : public GrGradientEffect {
 public:
 
     GrLinearGradient(GrTexture* texture);
-    GrLinearGradient(GrContext* ctx, const SkShader& shader,
+    GrLinearGradient(GrContext* ctx, const SkLinearGradient& shader,
                      GrSamplerState* sampler);
     virtual ~GrLinearGradient();
 
diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp
index 8feeff5313..3a0583bf01 100644
--- a/src/effects/gradients/SkRadialGradient.cpp
+++ b/src/effects/gradients/SkRadialGradient.cpp
@@ -222,7 +222,7 @@ void SkRadialGradient::shadeSpan16(int x, int y, uint16_t* dstCParam,
 SkShader::BitmapType SkRadialGradient::asABitmap(SkBitmap* bitmap, 
     SkMatrix* matrix, SkShader::TileMode* xy) const {
     if (bitmap) {
-        this->commonAsABitmap(bitmap);
+        this->getGradientTableBitmap(bitmap);
     }
     if (matrix) {
         matrix->setScale(SkIntToScalar(kGradient32Length),
@@ -520,9 +520,10 @@ GrRadialGradient::GrRadialGradient(GrTexture* texture)
 
 }
 
-GrRadialGradient::GrRadialGradient(GrContext* ctx, const SkShader& shader,
+GrRadialGradient::GrRadialGradient(GrContext* ctx, 
+                                   const SkRadialGradient& shader,
                                    GrSamplerState* sampler)
-                                   : INHERITED(ctx, shader, sampler) {
+    : INHERITED(ctx, shader, sampler) {
 }
 
 GrRadialGradient::~GrRadialGradient() {
diff --git a/src/effects/gradients/SkRadialGradient.h b/src/effects/gradients/SkRadialGradient.h
index a03d720428..0b7e30c2d4 100644
--- a/src/effects/gradients/SkRadialGradient.h
+++ b/src/effects/gradients/SkRadialGradient.h
@@ -48,7 +48,7 @@ class GrRadialGradient : public GrGradientEffect {
 public:
 
     GrRadialGradient(GrTexture* texture);
-    GrRadialGradient(GrContext* ctx, const SkShader& shader,
+    GrRadialGradient(GrContext* ctx, const SkRadialGradient& shader,
                      GrSamplerState* sampler);
     virtual ~GrRadialGradient();
 
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index 7f504948fe..963485cdf1 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -19,7 +19,7 @@ SkSweepGradient::SkSweepGradient(SkScalar cx, SkScalar cy, const SkColor colors[
 SkShader::BitmapType SkSweepGradient::asABitmap(SkBitmap* bitmap,
     SkMatrix* matrix, SkShader::TileMode* xy) const {
     if (bitmap) {
-        this->commonAsABitmap(bitmap);
+        this->getGradientTableBitmap(bitmap);
     }
     if (matrix) {
         *matrix = fPtsToUnit;
@@ -429,7 +429,8 @@ GrSweepGradient::GrSweepGradient(GrTexture* texture)
 
 }
 
-GrSweepGradient::GrSweepGradient(GrContext* ctx, const SkShader& shader,
+GrSweepGradient::GrSweepGradient(GrContext* ctx, 
+                                 const SkSweepGradient& shader,
                                  GrSamplerState* sampler) 
                                  : INHERITED(ctx, shader, sampler) {
 }
diff --git a/src/effects/gradients/SkSweepGradient.h b/src/effects/gradients/SkSweepGradient.h
index 1c2995a6f8..9a6c4eee6d 100644
--- a/src/effects/gradients/SkSweepGradient.h
+++ b/src/effects/gradients/SkSweepGradient.h
@@ -47,7 +47,7 @@ class GrSweepGradient : public GrGradientEffect {
 public:
 
     GrSweepGradient(GrTexture* texture);
-    GrSweepGradient(GrContext* ctx, const SkShader& shader,
+    GrSweepGradient(GrContext* ctx, const SkSweepGradient& shader,
                      GrSamplerState* sampler);
     virtual ~GrSweepGradient();
 
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
index 40ce528bef..feef3b9e1e 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -257,7 +257,7 @@ SkShader::BitmapType SkTwoPointConicalGradient::asABitmap(
     SkScalar diffLen = 0;
 
     if (bitmap) {
-        this->commonAsABitmap(bitmap);
+        this->getGradientTableBitmap(bitmap);
     }
     if (matrix) {
         diffLen = diff.length();
@@ -308,8 +308,7 @@ GrCustomStage* SkTwoPointConicalGradient::asNewCustomStage(
     sampler->textureParams()->setTileModeX(fTileMode);
     sampler->textureParams()->setTileModeY(kClamp_TileMode);
     sampler->textureParams()->setBilerp(true);
-    return SkNEW_ARGS(GrConical2Gradient, (context, *this, sampler, 
-                      diffLen, fRadius1, fRadius2 - fRadius1));
+    return SkNEW_ARGS(GrConical2Gradient, (context, *this, sampler));
 }
 
 SkTwoPointConicalGradient::SkTwoPointConicalGradient(
@@ -611,7 +610,7 @@ GrConical2Gradient::GrConical2Gradient(GrTexture* texture,
                                        GrScalar center,
                                        GrScalar radius,
                                        GrScalar diffRadius)
-    : INHERITED (texture)
+    : INHERITED(texture)
     , fCenterX1 (center)
     , fRadius0 (radius)
     , fDiffRadius (diffRadius) {
@@ -619,15 +618,12 @@ GrConical2Gradient::GrConical2Gradient(GrTexture* texture,
 }
 
 GrConical2Gradient::GrConical2Gradient(GrContext* ctx, 
-                                       const SkShader& shader,
-                                       GrSamplerState* sampler,
-                                       SkScalar center,
-                                       SkScalar startRadius,
-                                       SkScalar diffRadius)
-                                       : INHERITED(ctx, shader, sampler) 
-                                       , fCenterX1(center)
-                                       , fRadius0(startRadius)
-                                       , fDiffRadius(diffRadius) {
+                                       const SkTwoPointConicalGradient& shader,
+                                       GrSamplerState* sampler)
+    : INHERITED(ctx, shader, sampler) 
+    , fCenterX1(shader.getCenterX1())
+    , fRadius0(shader.getStartRadius())
+    , fDiffRadius(shader.getDiffRadius()) {
 }
 
 GrConical2Gradient::~GrConical2Gradient() {
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/effects/gradients/SkTwoPointConicalGradient.h
index fe25fde203..733ae522c9 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.h
+++ b/src/effects/gradients/SkTwoPointConicalGradient.h
@@ -64,6 +64,10 @@ public:
     virtual GrCustomStage* asNewCustomStage(GrContext* context,
         GrSamplerState* sampler) const SK_OVERRIDE;
 
+    SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); }
+    SkScalar getStartRadius() const { return fRadius1; }
+    SkScalar getDiffRadius() const { return fRadius2 - fRadius1; }
+
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTwoPointConicalGradient)
     
 protected:
@@ -87,9 +91,8 @@ class GrConical2Gradient : public GrGradientEffect {
 public:
 
     GrConical2Gradient(GrTexture* texture, GrScalar center, GrScalar radius, GrScalar diffRadius);
-    GrConical2Gradient(GrContext* ctx, const SkShader& shader,
-                       GrSamplerState* sampler, SkScalar center, 
-                       SkScalar radius, SkScalar diffRadius);
+    GrConical2Gradient(GrContext* ctx, const SkTwoPointConicalGradient& shader,
+                       GrSamplerState* sampler);
     virtual ~GrConical2Gradient();
 
     static const char* Name() { return "Two-Point Conical Gradient"; }
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index d2612a4f78..ed21d75180 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -184,7 +184,7 @@ SkShader::BitmapType SkTwoPointRadialGradient::asABitmap(
     SkMatrix* matrix,
     SkShader::TileMode* xy) const {
     if (bitmap) {
-        this->commonAsABitmap(bitmap);
+        this->getGradientTableBitmap(bitmap);
     }
     SkScalar diffL = 0; // just to avoid gcc warning
     if (matrix) {
@@ -235,8 +235,7 @@ GrCustomStage* SkTwoPointRadialGradient::asNewCustomStage(
     sampler->textureParams()->setTileModeX(fTileMode);
     sampler->textureParams()->setTileModeY(kClamp_TileMode);
     sampler->textureParams()->setBilerp(true);
-    return SkNEW_ARGS(GrRadial2Gradient, (context, *this, sampler, 
-        diffLen, fStartRadius, fDiffRadius));
+    return SkNEW_ARGS(GrRadial2Gradient, (context, *this, sampler));
 }
 
 void SkTwoPointRadialGradient::shadeSpan(int x, int y, SkPMColor* dstCParam,
@@ -590,17 +589,15 @@ GrRadial2Gradient::GrRadial2Gradient(GrTexture* texture,
 }
 
 GrRadial2Gradient::GrRadial2Gradient(GrContext* ctx, 
-                                     const SkShader& shader, 
-                                     GrSamplerState* sampler,
-                                     SkScalar center,
-                                     SkScalar startRadius,
-                                     SkScalar diffRadius)
-                                     : INHERITED(ctx, shader, sampler)
-                                     , fCenterX1(center)
-                                     , fRadius0(startRadius) 
-                                     , fPosRoot(diffRadius < 0) {
+                                     const SkTwoPointRadialGradient& shader, 
+                                     GrSamplerState* sampler)
+    : INHERITED(ctx, shader, sampler)
+    , fCenterX1(shader.getCenterX1())
+    , fRadius0(shader.getStartRadius()) 
+    , fPosRoot(shader.getDiffRadius() < 0) {
 }
 
+
 GrRadial2Gradient::~GrRadial2Gradient() {
 
 }
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.h b/src/effects/gradients/SkTwoPointRadialGradient.h
index 6d2b916e5d..bf94c3cc14 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.h
+++ b/src/effects/gradients/SkTwoPointRadialGradient.h
@@ -32,6 +32,10 @@ public:
                             const SkPaint& paint,
                             const SkMatrix& matrix) SK_OVERRIDE;
 
+    SkScalar getCenterX1() const { return fDiff.length(); }
+    SkScalar getStartRadius() const { return fStartRadius; }
+    SkScalar getDiffRadius() const { return fDiffRadius; }
+
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTwoPointRadialGradient)
 
 protected:
@@ -59,9 +63,8 @@ class GrRadial2Gradient : public GrGradientEffect {
 public:
 
     GrRadial2Gradient(GrTexture* texture, GrScalar center, GrScalar radius, bool posRoot);
-    GrRadial2Gradient(GrContext* ctx, const SkShader& shader,
-                      GrSamplerState* sampler, SkScalar center, 
-                      SkScalar radius, SkScalar diffRadius);
+    GrRadial2Gradient(GrContext* ctx, const SkTwoPointRadialGradient& shader,
+                      GrSamplerState* sampler);
     virtual ~GrRadial2Gradient();
 
     static const char* Name() { return "Two-Point Radial Gradient"; }