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
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index 7f50494..963485c 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -19,7 +19,7 @@
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(GrContext* ctx, const SkShader& shader,
+GrSweepGradient::GrSweepGradient(GrContext* ctx,
+ const SkSweepGradient& shader,
GrSamplerState* sampler)
: INHERITED(ctx, shader, sampler) {
}