diff options
| author |  reed <reed@google.com> | 2016-03-14 12:22:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-14 12:22:10 -0700 |
| commit | c6f28f7f0e788dc43cad4494e277e9ad7b958b6e (patch) | |
| tree | db9a76a5749d7ee909336a880d420a41204a4948 /bench/PatchBench.cpp | |
| parent | 106e10ddff5d473dc81dd1ce8ade615585ea609b (diff) | |
Reland of "Finish conversion to sk_sp<SkShader> (patchset #2 id:20001 of https://codereview.chromium.org/1803763002/ )"
This reverts commit 106e10ddff5d473dc81dd1ce8ade615585ea609b.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1803783002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
TBR=
Review URL: https://codereview.chromium.org/1803783002
Diffstat (limited to 'bench/PatchBench.cpp')
| -rw-r--r-- | bench/PatchBench.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bench/PatchBench.cpp b/bench/PatchBench.cpp index 6f51b4593a..5d7451a0c4 100644 --- a/bench/PatchBench.cpp +++ b/bench/PatchBench.cpp @@ -69,16 +69,15 @@ public: } // override this method to change the shader - virtual SkShader* createShader() { + virtual sk_sp<SkShader> createShader() { const SkColor colors[] = { SK_ColorRED, SK_ColorCYAN, SK_ColorGREEN, SK_ColorWHITE, SK_ColorMAGENTA, SK_ColorBLUE, SK_ColorYELLOW, }; const SkPoint pts[] = { { 200.f / 4.f, 0.f }, { 3.f * 200.f / 4, 200.f } }; - return SkGradientShader::CreateLinear(pts, colors, nullptr, - SK_ARRAY_COUNT(colors), - SkShader::kMirror_TileMode); + return SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors), + SkShader::kMirror_TileMode); } protected: @@ -115,7 +114,7 @@ protected: switch (fVertexMode) { case kTexCoords_VertexMode: case kBoth_VertexMode: - fPaint.setShader(this->createShader())->unref(); + fPaint.setShader(this->createShader()); break; default: fPaint.setShader(nullptr); |