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/shadertext3.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/shadertext3.cpp')
-rw-r--r-- | gm/shadertext3.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp index 0d1c03e345..07ecd7184b 100644 --- a/gm/shadertext3.cpp +++ b/gm/shadertext3.cpp @@ -26,11 +26,11 @@ static void makebm(SkBitmap* bm, int w, int h) { SkPaint paint; - paint.setShader(SkGradientShader::MakeLinear(kPts0, kColors0, kPos, - SK_ARRAY_COUNT(kColors0), SkShader::kClamp_TileMode)); + paint.setShader(SkGradientShader::CreateLinear(kPts0, kColors0, kPos, + SK_ARRAY_COUNT(kColors0), SkShader::kClamp_TileMode))->unref(); canvas.drawPaint(paint); - paint.setShader(SkGradientShader::MakeLinear(kPts1, kColors1, kPos, - SK_ARRAY_COUNT(kColors1), SkShader::kClamp_TileMode)); + paint.setShader(SkGradientShader::CreateLinear(kPts1, kColors1, kPos, + SK_ARRAY_COUNT(kColors1), SkShader::kClamp_TileMode))->unref(); canvas.drawPaint(paint); } @@ -100,13 +100,17 @@ protected: localM.postRotate(20); localM.postScale(1.15f, .85f); + SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(fBmp, + kTileModes[tm0], + kTileModes[tm1], + &localM)); + SkPaint fillPaint; fillPaint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&fillPaint); fillPaint.setTextSize(SkIntToScalar(kPointSize)); fillPaint.setFilterQuality(kLow_SkFilterQuality); - fillPaint.setShader(SkShader::MakeBitmapShader(fBmp, kTileModes[tm0], - kTileModes[tm1], &localM)); + fillPaint.setShader(shader); canvas->drawText(kText, kTextLen, 0, 0, fillPaint); canvas->drawText(kText, kTextLen, 0, 0, outlinePaint); |