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 /src/effects | |
| 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 'src/effects')
| -rw-r--r-- | src/effects/SkXfermodeImageFilter.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp index a29136a0dd..45c9f70568 100644 --- a/src/effects/SkXfermodeImageFilter.cpp +++ b/src/effects/SkXfermodeImageFilter.cpp @@ -23,25 +23,24 @@ /////////////////////////////////////////////////////////////////////////////// -sk_sp<SkImageFilter> SkXfermodeImageFilter::Make(sk_sp<SkXfermode> mode, - sk_sp<SkImageFilter> background, - sk_sp<SkImageFilter> foreground, +sk_sp<SkImageFilter> SkXfermodeImageFilter::Make(sk_sp<SkXfermode> mode, SkImageFilter* background, + SkImageFilter* foreground, const CropRect* cropRect) { - sk_sp<SkImageFilter> inputs[2] = { std::move(background), std::move(foreground) }; + SkImageFilter* inputs[2] = { background, foreground }; return sk_sp<SkImageFilter>(new SkXfermodeImageFilter(mode, inputs, cropRect)); } SkXfermodeImageFilter::SkXfermodeImageFilter(sk_sp<SkXfermode> mode, - sk_sp<SkImageFilter> inputs[2], + SkImageFilter* inputs[2], const CropRect* cropRect) - : INHERITED(inputs, 2, cropRect) + : INHERITED(2, inputs, cropRect) , fMode(std::move(mode)) {} sk_sp<SkFlattenable> SkXfermodeImageFilter::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2); sk_sp<SkXfermode> mode(buffer.readXfermode()); - return Make(std::move(mode), common.getInput(0), common.getInput(1), + return Make(std::move(mode), common.getInput(0).get(), common.getInput(1).get(), &common.cropRect()); } |