aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2016-04-04 07:13:49 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-04 07:13:49 -0700
commit3bc969264d4720d67f0b137552b3777a03b431a8 (patch)
tree54124faab382a1531c40a2b32558ee14ca5b5507 /src
parent94b87bd404d7007ce92672cc1853309df907e12a (diff)
Update SkXfermodeImageFilter to sk_sp
Diffstat (limited to 'src')
-rw-r--r--src/effects/SkXfermodeImageFilter.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
index 45c9f70568..a29136a0dd 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -23,24 +23,25 @@
///////////////////////////////////////////////////////////////////////////////
-sk_sp<SkImageFilter> SkXfermodeImageFilter::Make(sk_sp<SkXfermode> mode, SkImageFilter* background,
- SkImageFilter* foreground,
+sk_sp<SkImageFilter> SkXfermodeImageFilter::Make(sk_sp<SkXfermode> mode,
+ sk_sp<SkImageFilter> background,
+ sk_sp<SkImageFilter> foreground,
const CropRect* cropRect) {
- SkImageFilter* inputs[2] = { background, foreground };
+ sk_sp<SkImageFilter> inputs[2] = { std::move(background), std::move(foreground) };
return sk_sp<SkImageFilter>(new SkXfermodeImageFilter(mode, inputs, cropRect));
}
SkXfermodeImageFilter::SkXfermodeImageFilter(sk_sp<SkXfermode> mode,
- SkImageFilter* inputs[2],
+ sk_sp<SkImageFilter> inputs[2],
const CropRect* cropRect)
- : INHERITED(2, inputs, cropRect)
+ : INHERITED(inputs, 2, 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).get(), common.getInput(1).get(),
+ return Make(std::move(mode), common.getInput(0), common.getInput(1),
&common.cropRect());
}