diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-04 08:06:17 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-04 08:06:17 -0700 |
| commit | b591c77c3770a3216ce75c8b77f1017c917db1f9 (patch) | |
| tree | b49fbede2c9416e4a58f48e67aec41c8aed71310 /gm/imagefiltersgraph.cpp | |
| parent | 47a2dc8e229e93e1bcf7405747320920da1ab742 (diff) | |
Revert of Update SkXfermodeImageFilter to sk_sp (patchset #4 id:60001 of https://codereview.chromium.org/1852123002/ )
Reason for revert:
Chrome-land compilation failure.
Original issue's description:
> Update SkXfermodeImageFilter to sk_sp
>
> TBR=reed@google.com
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852123002
>
> Committed: https://skia.googlesource.com/skia/+/3bc969264d4720d67f0b137552b3777a03b431a8
TBR=fmalita@chromium.org,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1852273002
Diffstat (limited to 'gm/imagefiltersgraph.cpp')
| -rw-r--r-- | gm/imagefiltersgraph.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index ee2f7bf92b..dd9c37c093 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -148,7 +148,7 @@ protected: SkPaint paint; paint.setImageFilter(SkXfermodeImageFilter::Make( SkXfermode::Make(SkXfermode::kSrcOver_Mode), - std::move(colorMorph))); + colorMorph.get())); DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); @@ -165,9 +165,7 @@ protected: SkPaint paint; paint.setImageFilter( SkXfermodeImageFilter::Make(SkArithmeticMode::Make(0, SK_Scalar1, SK_Scalar1, 0), - std::move(matrixFilter), - std::move(offsetFilter), - nullptr)); + matrixFilter.get(), offsetFilter.get(), nullptr)); DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); @@ -180,8 +178,7 @@ protected: SkImageFilter::CropRect cropRect(SkRect::MakeWH(SkIntToScalar(95), SkIntToScalar(100))); SkPaint paint; paint.setImageFilter( - SkXfermodeImageFilter::Make(SkXfermode::Make(SkXfermode::kSrcIn_Mode), - std::move(blur), + SkXfermodeImageFilter::Make(SkXfermode::Make(SkXfermode::kSrcIn_Mode), blur.get(), nullptr, &cropRect)); DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); |