Index: gm/shadertext.cpp |
diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp |
index 79f7b860a04a311fb4a6cf712c44bf4bad33ac80..6845fa1c5ce41c6ef82da466ab76cfd9789e0a79 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 |
}; |
/////////////////////////////////////////////////////////////////////////////// |