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/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 5b351d3..21b415d 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -540,10 +540,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());
}
/////////////////////////////////////////////////////////////////////
@@ -570,9 +570,9 @@
return false;
}
matrix.postConcat(fPtsToUnit);
- sampler->setCustomStage(stage, matrix);
+ sampler->setEffect(stage, matrix);
} else {
- sampler->setCustomStage(stage, fPtsToUnit);
+ sampler->setEffect(stage, fPtsToUnit);
}
return true;