7 files changed, 20 insertions, 20 deletions
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index 079623a02e..dfef878a33 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -675,7 +675,7 @@ SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
 #include "effects/GrTextureStripAtlas.h"
 #include "SkGr.h"
 
-GrGLGradientStage::GrGLGradientStage(const GrProgramStageFactory& factory)
+GrGLGradientStage::GrGLGradientStage(const GrBackendEffectFactory& factory)
     : INHERITED(factory)
     , fCachedYCoord(GR_ScalarMax)
     , fFSYUni(GrGLUniformManager::kInvalidUniformHandle) { }
diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h
index c24b3cb6f5..04f1aa1233 100644
--- a/src/effects/gradients/SkGradientShaderPriv.h
+++ b/src/effects/gradients/SkGradientShaderPriv.h
@@ -195,7 +195,7 @@ private:
 #include "gl/GrGLEffect.h"
 
 class GrSamplerState;
-class GrProgramStageFactory;
+class GrBackendEffectFactory;
 
 /*
  * The intepretation of the texture matrix depends on the sample mode. The
@@ -274,7 +274,7 @@ private:
 class GrGLGradientStage : public GrGLLegacyEffect {
 public:
 
-    GrGLGradientStage(const GrProgramStageFactory& factory);
+    GrGLGradientStage(const GrBackendEffectFactory& factory);
     virtual ~GrGLGradientStage();
 
     virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE;
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 26079c3b27..1154d13f32 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -479,7 +479,7 @@ void SkLinearGradient::shadeSpan16(int x, int y,
 class GrGLLinearGradient : public GrGLGradientStage {
 public:
 
-    GrGLLinearGradient(const GrProgramStageFactory& factory,
+    GrGLLinearGradient(const GrBackendEffectFactory& factory,
                        const GrEffect&)
                        : INHERITED (factory) { }
 
@@ -508,8 +508,8 @@ public:
     virtual ~GrLinearGradient() { }
 
     static const char* Name() { return "Linear Gradient"; }
-    const GrProgramStageFactory& getFactory() const SK_OVERRIDE {
-        return GrTProgramStageFactory<GrLinearGradient>::getInstance();
+    const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
+        return GrTBackendEffectFactory<GrLinearGradient>::getInstance();
     }
 
     typedef GrGLLinearGradient GLEffect;
diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp
index 6cbc412c43..dac1dc070b 100644
--- a/src/effects/gradients/SkRadialGradient.cpp
+++ b/src/effects/gradients/SkRadialGradient.cpp
@@ -476,7 +476,7 @@ void SkRadialGradient::shadeSpan(int x, int y,
 class GrGLRadialGradient : public GrGLGradientStage {
 public:
 
-    GrGLRadialGradient(const GrProgramStageFactory& factory,
+    GrGLRadialGradient(const GrBackendEffectFactory& factory,
                        const GrEffect&) : INHERITED (factory) { }
     virtual ~GrGLRadialGradient() { }
 
@@ -507,8 +507,8 @@ public:
     virtual ~GrRadialGradient() { }
 
     static const char* Name() { return "Radial Gradient"; }
-    virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE {
-        return GrTProgramStageFactory<GrRadialGradient>::getInstance();
+    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
+        return GrTBackendEffectFactory<GrRadialGradient>::getInstance();
     }
 
     typedef GrGLRadialGradient GLEffect;
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index 4b7ea8822b..768f59d5de 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -385,7 +385,7 @@ void SkSweepGradient::shadeSpan16(int x, int y, uint16_t* SK_RESTRICT dstC,
 class GrGLSweepGradient : public GrGLGradientStage {
 public:
 
-    GrGLSweepGradient(const GrProgramStageFactory& factory,
+    GrGLSweepGradient(const GrBackendEffectFactory& factory,
                       const GrEffect&) : INHERITED (factory) { }
     virtual ~GrGLSweepGradient() { }
 
@@ -415,8 +415,8 @@ public:
     virtual ~GrSweepGradient() { }
 
     static const char* Name() { return "Sweep Gradient"; }
-    virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE {
-        return GrTProgramStageFactory<GrSweepGradient>::getInstance();
+    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
+        return GrTBackendEffectFactory<GrSweepGradient>::getInstance();
     }
 
     typedef GrGLSweepGradient GLEffect;
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
index e1a7cf5f97..4150d2cdf6 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -322,7 +322,7 @@ static const UniformHandle kInvalidUniformHandle = GrGLUniformManager::kInvalidU
 class GrGLConical2Gradient : public GrGLGradientStage {
 public:
 
-    GrGLConical2Gradient(const GrProgramStageFactory& factory,
+    GrGLConical2Gradient(const GrBackendEffectFactory& factory,
                          const GrEffect&);
     virtual ~GrGLConical2Gradient() { }
 
@@ -378,8 +378,8 @@ public:
     virtual ~GrConical2Gradient() { }
 
     static const char* Name() { return "Two-Point Conical Gradient"; }
-    virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE {
-        return GrTProgramStageFactory<GrConical2Gradient>::getInstance();
+    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
+        return GrTBackendEffectFactory<GrConical2Gradient>::getInstance();
     }
     virtual bool isEqual(const GrEffect& sBase) const SK_OVERRIDE {
         const GrConical2Gradient& s = static_cast<const GrConical2Gradient&>(sBase);
@@ -449,7 +449,7 @@ GrEffect* GrConical2Gradient::TestCreate(SkRandom* random,
 /////////////////////////////////////////////////////////////////////
 
 GrGLConical2Gradient::GrGLConical2Gradient(
-        const GrProgramStageFactory& factory,
+        const GrBackendEffectFactory& factory,
         const GrEffect& baseData)
     : INHERITED(factory)
     , fVSParamUni(kInvalidUniformHandle)
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index adca94f17e..e36727611c 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -357,7 +357,7 @@ class GrGLRadial2Gradient : public GrGLGradientStage {
 
 public:
 
-    GrGLRadial2Gradient(const GrProgramStageFactory& factory,
+    GrGLRadial2Gradient(const GrBackendEffectFactory& factory,
                         const GrEffect&);
     virtual ~GrGLRadial2Gradient() { }
 
@@ -410,8 +410,8 @@ public:
     virtual ~GrRadial2Gradient() { }
 
     static const char* Name() { return "Two-Point Radial Gradient"; }
-    virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE {
-        return GrTProgramStageFactory<GrRadial2Gradient>::getInstance();
+    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
+        return GrTBackendEffectFactory<GrRadial2Gradient>::getInstance();
     }
     virtual bool isEqual(const GrEffect& sBase) const SK_OVERRIDE {
         const GrRadial2Gradient& s = static_cast<const GrRadial2Gradient&>(sBase);
@@ -482,7 +482,7 @@ GrEffect* GrRadial2Gradient::TestCreate(SkRandom* random,
 /////////////////////////////////////////////////////////////////////
 
 GrGLRadial2Gradient::GrGLRadial2Gradient(
-        const GrProgramStageFactory& factory,
+        const GrBackendEffectFactory& factory,
         const GrEffect& baseData)
     : INHERITED(factory)
     , fVSParamUni(kInvalidUniformHandle)