diff options
| author |  reed <reed@google.com> | 2016-03-08 18:50:00 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-08 18:50:00 -0800 |
| commit | 8a21c9fe7f5fef9e87115defef27bd7218419f28 (patch) | |
| tree | 1dd8b9eda9eae99b33bc88b97bd5f0a7a0769dc3 /src/c | |
| parent | 042f859c19f71ca9feacddd1cb058ff59eed8963 (diff) | |
use Make instead of Create to return a shared shader
Partially updated call sites. Undefine the flag in SkSHader.h to convert the remaining sites.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1772463002
Review URL: https://codereview.chromium.org/1772463002
Diffstat (limited to 'src/c')
| -rw-r--r-- | src/c/sk_surface.cpp | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/src/c/sk_surface.cpp b/src/c/sk_surface.cpp index 6618881bc1..f7fa30f28a 100644 --- a/src/c/sk_surface.cpp +++ b/src/c/sk_surface.cpp @@ -551,10 +551,10 @@ sk_shader_t* sk_shader_new_linear_gradient(const sk_point_t pts[2], } else { matrix.setIdentity(); } - SkShader* s = SkGradientShader::CreateLinear(reinterpret_cast<const SkPoint*>(pts), - reinterpret_cast<const SkColor*>(colors), - colorPos, colorCount, mode, 0, &matrix); - return (sk_shader_t*)s; + return (sk_shader_t*)SkGradientShader::MakeLinear(reinterpret_cast<const SkPoint*>(pts), + reinterpret_cast<const SkColor*>(colors), + colorPos, colorCount, + mode, 0, &matrix).release(); } static const SkPoint& to_skpoint(const sk_point_t& p) { @@ -579,12 +579,10 @@ sk_shader_t* sk_shader_new_radial_gradient(const sk_point_t* ccenter, matrix.setIdentity(); } SkPoint center = to_skpoint(*ccenter); - SkShader* s = SkGradientShader::CreateRadial( - center, (SkScalar)radius, - reinterpret_cast<const SkColor*>(colors), - reinterpret_cast<const SkScalar*>(colorPos), - colorCount, mode, 0, &matrix); - return (sk_shader_t*)s; + return (sk_shader_t*)SkGradientShader::MakeRadial(center, (SkScalar)radius, + reinterpret_cast<const SkColor*>(colors), + reinterpret_cast<const SkScalar*>(colorPos), + colorCount, mode, 0, &matrix).release(); } sk_shader_t* sk_shader_new_sweep_gradient(const sk_point_t* ccenter, @@ -598,13 +596,11 @@ sk_shader_t* sk_shader_new_sweep_gradient(const sk_point_t* ccenter, } else { matrix.setIdentity(); } - SkShader* s = SkGradientShader::CreateSweep( - (SkScalar)(ccenter->x), - (SkScalar)(ccenter->y), - reinterpret_cast<const SkColor*>(colors), - reinterpret_cast<const SkScalar*>(colorPos), - colorCount, 0, &matrix); - return (sk_shader_t*)s; + return (sk_shader_t*)SkGradientShader::MakeSweep((SkScalar)(ccenter->x), + (SkScalar)(ccenter->y), + reinterpret_cast<const SkColor*>(colors), + reinterpret_cast<const SkScalar*>(colorPos), + colorCount, 0, &matrix).release(); } sk_shader_t* sk_shader_new_two_point_conical_gradient(const sk_point_t* start, @@ -628,13 +624,11 @@ sk_shader_t* sk_shader_new_two_point_conical_gradient(const sk_point_t* start, } SkPoint skstart = to_skpoint(*start); SkPoint skend = to_skpoint(*end); - SkShader* s = SkGradientShader::CreateTwoPointConical( - skstart, (SkScalar)startRadius, - skend, (SkScalar)endRadius, - reinterpret_cast<const SkColor*>(colors), - reinterpret_cast<const SkScalar*>(colorPos), - colorCount, mode, 0, &matrix); - return (sk_shader_t*)s; + return (sk_shader_t*)SkGradientShader::MakeTwoPointConical(skstart, (SkScalar)startRadius, + skend, (SkScalar)endRadius, + reinterpret_cast<const SkColor*>(colors), + reinterpret_cast<const SkScalar*>(colorPos), + colorCount, mode, 0, &matrix).release(); } /////////////////////////////////////////////////////////////////////////////////////////// |