From 4c9776b046dd5e9e46e2d1ce35154855c8fcb381 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 22 Mar 2016 08:10:17 -0700 Subject: 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= Review URL: https://codereview.chromium.org/1825073002 --- gm/coloremoji.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gm/coloremoji.cpp') diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index 78c347c079..4be8202d19 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -34,8 +34,8 @@ static SkImageFilter* make_grayscale(SkImageFilter* input = nullptr) { matrix[1] = matrix[6] = matrix[11] = 0.7152f; matrix[2] = matrix[7] = matrix[12] = 0.0722f; matrix[18] = 1.0f; - SkAutoTUnref filter(SkColorMatrixFilter::Create(matrix)); - return SkColorFilterImageFilter::Create(filter, input); + auto filter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix)); + return SkColorFilterImageFilter::Create(filter.get(), input); } static SkImageFilter* make_blur(float amount, SkImageFilter* input = nullptr) { -- cgit v1.2.3