diff options
| author |  reed <reed@google.com> | 2016-03-22 08:10:17 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 08:10:17 -0700 |
| commit | 4c9776b046dd5e9e46e2d1ce35154855c8fcb381 (patch) | |
| tree | 3cdcc394a99b0483921eb86a8f5cc118f20d6433 /gm/imagefilterscropexpand.cpp | |
| parent | 1eb81db650d31f50be67b12d60c4f9e7dd08432f (diff) | |
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
Diffstat (limited to 'gm/imagefilterscropexpand.cpp')
| -rw-r--r-- | gm/imagefilterscropexpand.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gm/imagefilterscropexpand.cpp b/gm/imagefilterscropexpand.cpp index f3ca4d32a6..ada206cea4 100644 --- a/gm/imagefilterscropexpand.cpp +++ b/gm/imagefilterscropexpand.cpp @@ -40,8 +40,6 @@ protected: SkISize onISize() override { return SkISize::Make(730, 650); } void onDraw(SkCanvas* canvas) override { - SkAutoTUnref<SkColorFilter> cf( - SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode)); SkImageFilter::CropRect cropRect( SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)), SkImageFilter::CropRect::kHasAll_CropEdge); @@ -59,7 +57,7 @@ protected: 0, 1, 0, 0, sk255, 0, 0, 1, 0, 0, 0, 0, 0, 0, sk255 }; - SkAutoTUnref<SkColorFilter> cfAlphaTrans(SkColorMatrixFilter::Create(matrix)); + auto cfAlphaTrans(SkColorFilter::MakeMatrixFilterRowMajor255(matrix)); SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64)); SkScalar MARGIN = SkIntToScalar(12); @@ -80,7 +78,7 @@ protected: SkImageFilter::CropRect bigRect(rect, SkImageFilter::CropRect::kHasAll_CropEdge); Draw(canvas, checkerboard, rect, SkColorFilterImageFilter::Create( - cfAlphaTrans, noopCropped.get(), &bigRect)); + cfAlphaTrans.get(), noopCropped.get(), &bigRect)); Draw(canvas, checkerboard, rect, SkBlurImageFilter::Create( 0.3f, 0.3f, noopCropped.get(), &bigRect)); |