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/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index d2612a4..ed21d75 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -184,7 +184,7 @@
SkMatrix* matrix,
SkShader::TileMode* xy) const {
if (bitmap) {
- this->commonAsABitmap(bitmap);
+ this->getGradientTableBitmap(bitmap);
}
SkScalar diffL = 0; // just to avoid gcc warning
if (matrix) {
@@ -235,8 +235,7 @@
sampler->textureParams()->setTileModeX(fTileMode);
sampler->textureParams()->setTileModeY(kClamp_TileMode);
sampler->textureParams()->setBilerp(true);
- return SkNEW_ARGS(GrRadial2Gradient, (context, *this, sampler,
- diffLen, fStartRadius, fDiffRadius));
+ return SkNEW_ARGS(GrRadial2Gradient, (context, *this, sampler));
}
void SkTwoPointRadialGradient::shadeSpan(int x, int y, SkPMColor* dstCParam,
@@ -590,17 +589,15 @@
}
GrRadial2Gradient::GrRadial2Gradient(GrContext* ctx,
- const SkShader& shader,
- GrSamplerState* sampler,
- SkScalar center,
- SkScalar startRadius,
- SkScalar diffRadius)
- : INHERITED(ctx, shader, sampler)
- , fCenterX1(center)
- , fRadius0(startRadius)
- , fPosRoot(diffRadius < 0) {
+ const SkTwoPointRadialGradient& shader,
+ GrSamplerState* sampler)
+ : INHERITED(ctx, shader, sampler)
+ , fCenterX1(shader.getCenterX1())
+ , fRadius0(shader.getStartRadius())
+ , fPosRoot(shader.getDiffRadius() < 0) {
}
+
GrRadial2Gradient::~GrRadial2Gradient() {
}