diff options
| author |  reed <reed@google.com> | 2016-03-13 13:01:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-13 13:01:57 -0700 |
| commit | 9283d20afc27571f7a871d1bd1100dd5df584941 (patch) | |
| tree | 3688fa1847d47e1f2493b040bbe91594f6274cf0 /gm/patch.cpp | |
| parent | ce563cdd48ec7ce4e0420dd88760df9be9dba50c (diff) | |
Revert of more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ )
Reason for revert:
seems to have changed pictureshadertile
Original issue's description:
> more shader-->sp conversions
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789633002
>
> Committed: https://skia.googlesource.com/skia/+/ce563cdd48ec7ce4e0420dd88760df9be9dba50c
TBR=fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1790353002
Diffstat (limited to 'gm/patch.cpp')
| -rw-r--r-- | gm/patch.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/patch.cpp b/gm/patch.cpp index 5b661f4b7c..d9f6d57d6f 100644 --- a/gm/patch.cpp +++ b/gm/patch.cpp @@ -10,15 +10,15 @@ #include "SkGradientShader.h" #include "SkPatchUtils.h" -static sk_sp<SkShader> make_shader() { +static SkShader* make_shader() { const SkColor colors[] = { SK_ColorRED, SK_ColorCYAN, SK_ColorGREEN, SK_ColorWHITE, SK_ColorMAGENTA, SK_ColorBLUE, SK_ColorYELLOW, }; const SkPoint pts[] = { { 100.f / 4.f, 0.f }, { 3.f * 100.f / 4.f, 100.f } }; - return SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors), - SkShader::kMirror_TileMode); + return SkGradientShader::CreateLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors), + SkShader::kMirror_TileMode); } static void draw_control_points(SkCanvas* canvas, const SkPoint cubics[12]) { @@ -92,7 +92,7 @@ DEF_SIMPLE_GM(patch_primitive, canvas, 800, 800) { SkXfermode::kModulate_Mode, }; - sk_sp<SkShader> shader(make_shader()); + SkAutoTUnref<SkShader> shader(make_shader()); canvas->save(); for (int y = 0; y < 3; y++) { |