GrCustomStage Renaming Part 2
GrSamplerState member rename
GrCustomStageUnitTest rename
some comment updates
Review URL: https://codereview.appspot.com/6771043
git-svn-id: http://skia.googlecode.com/svn/trunk@6078 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index 50938f6..78220f8 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -473,10 +473,10 @@
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 @@
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;
}