diff options
author | reed <reed@google.com> | 2015-05-04 08:32:51 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-04 08:32:51 -0700 |
commit | 71a6cbfc585959738dc0b375603696ca7f60605f (patch) | |
tree | 308b974c044f356dbc0e0b6599e0be275f5b4f94 /gm/shadertext.cpp | |
parent | f603fb3d0e5fa57c3f228d66945bef198b001135 (diff) |
remove redundant/deprecated TwoPointRadial gradiet -- use TwoPointConical
This CL derived from https://codereview.chromium.org/1114243005/
BUG=skia:
Review URL: https://codereview.chromium.org/1117423003
Diffstat (limited to 'gm/shadertext.cpp')
-rw-r--r-- | gm/shadertext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp index 79f7b860a0..6845fa1c5c 100644 --- a/gm/shadertext.cpp +++ b/gm/shadertext.cpp @@ -64,13 +64,13 @@ static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data, SkShader: return SkGradientShader::CreateSweep(center.fX, center.fY, data.fColors, data.fPos, data.fCount); } -static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { +static SkShader* Make2Conical(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { SkPoint center0, center1; center0.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5), SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4)); - return SkGradientShader::CreateTwoPointRadial( + return SkGradientShader::CreateTwoPointConical( center1, (pts[1].fX - pts[0].fX) / 7, center0, (pts[1].fX - pts[0].fX) / 2, data.fColors, data.fPos, data.fCount, tm); @@ -79,7 +79,7 @@ static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, SkShade typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm); static const GradMaker gGradMakers[] = { - MakeLinear, MakeRadial, MakeSweep, Make2Radial + MakeLinear, MakeRadial, MakeSweep, Make2Conical }; /////////////////////////////////////////////////////////////////////////////// |