diff options
author | reed <reed@google.com> | 2016-03-14 11:53:07 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-14 11:53:07 -0700 |
commit | 106e10ddff5d473dc81dd1ce8ade615585ea609b (patch) | |
tree | 4cdbff97b6e2bf856dff2875ff2c8a818f9b27ea /bench/ColorCubeBench.cpp | |
parent | 15c3a0e55bd9134dace0ace2fffb855a0f09542f (diff) |
Revert of Finish conversion to sk_sp<SkShader> (patchset #2 id:20001 of https://codereview.chromium.org/1803763002/ )
Reason for revert:
need to update cmake build example
Original issue's description:
> Finish conversion to sk_sp<SkShader>
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1803763002
>
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/15c3a0e55bd9134dace0ace2fffb855a0f09542f
TBR=
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1798133003
Diffstat (limited to 'bench/ColorCubeBench.cpp')
-rw-r--r-- | bench/ColorCubeBench.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bench/ColorCubeBench.cpp b/bench/ColorCubeBench.cpp index 9f6bd001ff..6c5a16d6a2 100644 --- a/bench/ColorCubeBench.cpp +++ b/bench/ColorCubeBench.cpp @@ -48,13 +48,13 @@ protected: } private: - static sk_sp<SkShader> MakeLinear(const SkISize& size) { + static SkShader* MakeLinear(const SkISize& size) { const SkPoint pts[2] = { { 0, 0 }, { SkIntToScalar(size.width()), SkIntToScalar(size.height()) } }; static const SkColor colors[] = { SK_ColorYELLOW, SK_ColorBLUE }; - return SkGradientShader::MakeLinear( + return SkGradientShader::CreateLinear( pts, colors, nullptr, 2, SkShader::kRepeat_TileMode, 0, &SkMatrix::I()); } @@ -64,9 +64,11 @@ private: canvas.clear(0x00000000); SkPaint paint; paint.setAntiAlias(true); - paint.setShader(MakeLinear(fSize)); + SkShader* shader = MakeLinear(fSize); + paint.setShader(shader); SkRect r = { 0, 0, SkIntToScalar(fSize.width()), SkIntToScalar(fSize.height()) }; canvas.drawRect(r, paint); + shader->unref(); } void makeCubeData() { |