diff options
| author |  Brian Osman <brianosman@google.com> | 2016-10-24 09:24:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-24 14:02:27 +0000 |
| commit | 526972ecb5411b84ba2f5e20252f178f9ee2151f (patch) | |
| tree | ef89b6a40fcdf90ae8e0b00b8f7d247510e03656 /gm/gradients.cpp | |
| parent | 09732a6b0e7c4b087279095762f9d27a4f556aba (diff) | |
Rename all color space factories from New* to Make*
Matches our naming convention for all other types - factories that
return sk_sp (or any type that intelligently manages its own
lifetime) are named Make.
Previous factories are still around, assuming
SK_SUPPORT_LEGACY_COLOR_SPACE_FACTORIES is defined. Enable that
define for Android, etc.
See also: https://codereview.chromium.org/2442053002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3822
Change-Id: Iaea9376490736b494e8ffc820831f052bbe1478d
Reviewed-on: https://skia-review.googlesource.com/3822
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'gm/gradients.cpp')
| -rw-r--r-- | gm/gradients.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/gradients.cpp b/gm/gradients.cpp index 4c0c8e7972..45b6564a64 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -61,7 +61,7 @@ static sk_sp<SkShader> MakeLinear(const SkPoint pts[2], const GradData& data, static sk_sp<SkShader> MakeLinear4f(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, const SkMatrix& localMatrix) { - auto srgb = SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named); + auto srgb = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); return SkGradientShader::MakeLinear(pts, data.fColors4f, srgb, data.fPos, data.fCount, tm, 0, &localMatrix); } @@ -80,7 +80,7 @@ static sk_sp<SkShader> MakeRadial4f(const SkPoint pts[2], const GradData& data, SkPoint center; center.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); - auto srgb = SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named); + auto srgb = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); return SkGradientShader::MakeRadial(center, center.fX, data.fColors4f, srgb, data.fPos, data.fCount, tm, 0, &localMatrix); } @@ -99,7 +99,7 @@ static sk_sp<SkShader> MakeSweep4f(const SkPoint pts[2], const GradData& data, SkPoint center; center.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); - auto srgb = SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named); + auto srgb = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); return SkGradientShader::MakeSweep(center.fX, center.fY, data.fColors4f, srgb, data.fPos, data.fCount, 0, &localMatrix); } @@ -124,7 +124,7 @@ static sk_sp<SkShader> Make2Radial4f(const SkPoint pts[2], const GradData& data, 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)); - auto srgb = SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named); + auto srgb = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); return SkGradientShader::MakeTwoPointConical(center1, (pts[1].fX - pts[0].fX) / 7, center0, (pts[1].fX - pts[0].fX) / 2, data.fColors4f, srgb, data.fPos, data.fCount, tm, @@ -150,7 +150,7 @@ static sk_sp<SkShader> Make2Conical4f(const SkPoint pts[2], const GradData& data SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; center0.set(pts[0].fX + radius0, pts[0].fY + radius0); center1.set(pts[1].fX - radius1, pts[1].fY - radius1); - auto srgb = SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named); + auto srgb = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); return SkGradientShader::MakeTwoPointConical(center1, radius1, center0, radius0, data.fColors4f, srgb, data.fPos, data.fCount, tm, 0, &localMatrix); |