From 106e10ddff5d473dc81dd1ce8ade615585ea609b Mon Sep 17 00:00:00 2001 From: reed Date: Mon, 14 Mar 2016 11:53:07 -0700 Subject: Revert of Finish conversion to sk_sp (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 > > 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 --- bench/PatchBench.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'bench/PatchBench.cpp') diff --git a/bench/PatchBench.cpp b/bench/PatchBench.cpp index 5d7451a0c4..6f51b4593a 100644 --- a/bench/PatchBench.cpp +++ b/bench/PatchBench.cpp @@ -69,15 +69,16 @@ public: } // override this method to change the shader - virtual sk_sp createShader() { + virtual 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::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors), - SkShader::kMirror_TileMode); + return SkGradientShader::CreateLinear(pts, colors, nullptr, + SK_ARRAY_COUNT(colors), + SkShader::kMirror_TileMode); } protected: @@ -114,7 +115,7 @@ protected: switch (fVertexMode) { case kTexCoords_VertexMode: case kBoth_VertexMode: - fPaint.setShader(this->createShader()); + fPaint.setShader(this->createShader())->unref(); break; default: fPaint.setShader(nullptr); -- cgit v1.2.3