From d6889293dd0942f27f9593f679722c956831f2c4 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 22 Mar 2016 08:59:19 -0700 Subject: Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (patchset #3 id:40001 of https://codereview.chromium.org/1825073002/ ) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reason for revert: CreateModeFilter not compiling Original issue's description: > Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )" > > Fixed legacy withColorFilter to call new(er) make method > > This reverts commit 1eb81db650d31f50be67b12d60c4f9e7dd08432f. > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825073002 > > TBR= > > Committed: https://skia.googlesource.com/skia/+/4c9776b046dd5e9e46e2d1ce35154855c8fcb381 TBR= # 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/1821103004 --- gm/vertices.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'gm/vertices.cpp') diff --git a/gm/vertices.cpp b/gm/vertices.cpp index 9c4ccc16bb..177dc43c2b 100644 --- a/gm/vertices.cpp +++ b/gm/vertices.cpp @@ -26,17 +26,17 @@ static sk_sp make_shader2() { return SkShader::MakeColorShader(SK_ColorBLUE); } -static sk_sp make_color_filter() { - return SkColorFilter::MakeModeFilter(0xFFAABBCC, SkXfermode::kDarken_Mode); +static SkColorFilter* make_color_filter() { + return SkColorFilter::CreateModeFilter(0xFFAABBCC, SkXfermode::kDarken_Mode); } class VerticesGM : public skiagm::GM { - SkPoint fPts[9]; - SkPoint fTexs[9]; - SkColor fColors[9]; - sk_sp fShader1; - sk_sp fShader2; - sk_sp fColorFilter; + SkPoint fPts[9]; + SkPoint fTexs[9]; + SkColor fColors[9]; + sk_sp fShader1; + sk_sp fShader2; + SkAutoTUnref fColorFilter; public: VerticesGM() {} @@ -60,7 +60,7 @@ protected: fShader1 = make_shader1(w, h); fShader2 = make_shader2(); - fColorFilter = make_color_filter(); + fColorFilter.reset(make_color_filter()); SkRandom rand; for (size_t i = 0; i < SK_ARRAY_COUNT(fColors); ++i) { @@ -85,11 +85,11 @@ protected: }; const struct { - const SkColor* fColors; - const SkPoint* fTexs; - const sk_sp& fShader; - const sk_sp& fColorFilter; - uint8_t fAlpha; + const SkColor* fColors; + const SkPoint* fTexs; + const sk_sp& fShader; + SkColorFilter* fColorFilter; + uint8_t fAlpha; } rec[] = { { fColors, nullptr, fShader1, nullptr , 0xFF }, { nullptr, fTexs , fShader1, nullptr , 0xFF }, -- cgit v1.2.3