5 files changed, 23 insertions, 23 deletions
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 5b351d33d0..21b415d58b 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -540,10 +540,10 @@ GrEffect* GrLinearGradient::TestCreate(SkRandom* random,
                                                                  tm));
     GrSamplerState sampler;
     shader->asNewCustomStage(context, &sampler);
-    GrAssert(NULL != sampler.getCustomStage());
+    GrAssert(NULL != sampler.getEffect());
     // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect*
-    sampler.getCustomStage()->ref();
-    return const_cast<GrEffect*>(sampler.getCustomStage());
+    sampler.getEffect()->ref();
+    return const_cast<GrEffect*>(sampler.getEffect());
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -570,9 +570,9 @@ bool SkLinearGradient::asNewCustomStage(GrContext* context, GrSamplerState* samp
             return false;
         }
         matrix.postConcat(fPtsToUnit);
-        sampler->setCustomStage(stage, matrix);
+        sampler->setEffect(stage, matrix);
     } else {
-        sampler->setCustomStage(stage, fPtsToUnit);
+        sampler->setEffect(stage, fPtsToUnit);
     }
 
     return true;
diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp
index ca8325d91b..74d16d56cc 100644
--- a/src/effects/gradients/SkRadialGradient.cpp
+++ b/src/effects/gradients/SkRadialGradient.cpp
@@ -539,10 +539,10 @@ GrEffect* GrRadialGradient::TestCreate(SkRandom* random,
                                                                  tm));
     GrSamplerState sampler;
     shader->asNewCustomStage(context, &sampler);
-    GrAssert(NULL != sampler.getCustomStage());
+    GrAssert(NULL != sampler.getEffect());
     // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect*
-    sampler.getCustomStage()->ref();
-    return const_cast<GrEffect*>(sampler.getCustomStage());
+    sampler.getEffect()->ref();
+    return const_cast<GrEffect*>(sampler.getEffect());
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -568,9 +568,9 @@ bool SkRadialGradient::asNewCustomStage(GrContext* context, GrSamplerState* samp
             return false;
         }
         matrix.postConcat(fPtsToUnit);
-        sampler->setCustomStage(stage, matrix);
+        sampler->setEffect(stage, matrix);
     } else {
-        sampler->setCustomStage(stage, fPtsToUnit);
+        sampler->setEffect(stage, fPtsToUnit);
     }
 
     return true;
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index 416babc622..365507b98f 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -445,10 +445,10 @@ GrEffect* GrSweepGradient::TestCreate(SkRandom* random,
                                                                 colors, stops, colorCount));
     GrSamplerState sampler;
     shader->asNewCustomStage(context, &sampler);
-    GrAssert(NULL != sampler.getCustomStage());
+    GrAssert(NULL != sampler.getEffect());
     // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect*
-    sampler.getCustomStage()->ref();
-    return const_cast<GrEffect*>(sampler.getCustomStage());
+    sampler.getEffect()->ref();
+    return const_cast<GrEffect*>(sampler.getEffect());
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -475,9 +475,9 @@ bool SkSweepGradient::asNewCustomStage(GrContext* context, GrSamplerState* sampl
             return false;
         }
         matrix.postConcat(fPtsToUnit);
-        sampler->setCustomStage(stage, matrix);
+        sampler->setEffect(stage, matrix);
     } else {
-        sampler->setCustomStage(stage, fPtsToUnit);
+        sampler->setEffect(stage, fPtsToUnit);
     }
 
     return true;
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
index 1b0f58f7b0..4472d03d9f 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -439,10 +439,10 @@ GrEffect* GrConical2Gradient::TestCreate(SkRandom* random,
                                                                           tm));
     GrSamplerState sampler;
     shader->asNewCustomStage(context, &sampler);
-    GrAssert(NULL != sampler.getCustomStage());
+    GrAssert(NULL != sampler.getEffect());
     // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect*
-    sampler.getCustomStage()->ref();
-    return const_cast<GrEffect*>(sampler.getCustomStage());
+    sampler.getEffect()->ref();
+    return const_cast<GrEffect*>(sampler.getEffect());
 }
 
 
@@ -693,7 +693,7 @@ bool SkTwoPointConicalGradient::asNewCustomStage(GrContext* context,
         matrix.preConcat(localM);
     }
 
-    sampler->setCustomStage(SkNEW_ARGS(GrConical2Gradient, (context, *this, fTileMode)), matrix)->unref();
+    sampler->setEffect(SkNEW_ARGS(GrConical2Gradient, (context, *this, fTileMode)), matrix)->unref();
 
     return true;
 }
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index 50938f6fe7..78220f8d2a 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -473,10 +473,10 @@ GrEffect* GrRadial2Gradient::TestCreate(SkRandom* random,
                                                                          tm));
     GrSamplerState sampler;
     shader->asNewCustomStage(context, &sampler);
-    GrAssert(NULL != sampler.getCustomStage());
+    GrAssert(NULL != sampler.getEffect());
     // const_cast and ref is a hack! Will remove when asNewCustomStage returns GrEffect*
-    sampler.getCustomStage()->ref();
-    return const_cast<GrEffect*>(sampler.getCustomStage());
+    sampler.getEffect()->ref();
+    return const_cast<GrEffect*>(sampler.getEffect());
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -665,7 +665,7 @@ bool SkTwoPointRadialGradient::asNewCustomStage(GrContext* context,
         matrix.preConcat(localM);
     }
 
-    sampler->setCustomStage(SkNEW_ARGS(GrRadial2Gradient, (context, *this, fTileMode)), matrix)->unref();
+    sampler->setEffect(SkNEW_ARGS(GrRadial2Gradient, (context, *this, fTileMode)), matrix)->unref();
     return true;
 }