diff options
author | 2016-03-22 07:23:24 -0700 | |
---|---|---|
committer | 2016-03-22 07:23:24 -0700 | |
commit | f809d7687a4fb7b88b651b046da2bc0035d6aa09 (patch) | |
tree | 38fa4182df2c735459e43b0eaaa073c1ef8c612d /src/effects/SkColorFilterImageFilter.cpp | |
parent | cfcd1819d1431bbe5812c174fc337d3678d63f06 (diff) |
switch colorfilters to sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1822623002
Review URL: https://codereview.chromium.org/1822623002
Diffstat (limited to 'src/effects/SkColorFilterImageFilter.cpp')
-rw-r--r-- | src/effects/SkColorFilterImageFilter.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/effects/SkColorFilterImageFilter.cpp b/src/effects/SkColorFilterImageFilter.cpp index 96ce5d9690..6eb66533d9 100644 --- a/src/effects/SkColorFilterImageFilter.cpp +++ b/src/effects/SkColorFilterImageFilter.cpp @@ -25,10 +25,10 @@ SkImageFilter* SkColorFilterImageFilter::Create(SkColorFilter* cf, SkImageFilter if (input && input->isColorFilterNode(&inputCF)) { // This is an optimization, as it collapses the hierarchy by just combining the two // colorfilters into a single one, which the new imagefilter will wrap. - SkAutoUnref autoUnref(inputCF); - SkAutoTUnref<SkColorFilter> newCF(SkColorFilter::CreateComposeFilter(cf, inputCF)); + sk_sp<SkColorFilter> newCF(SkColorFilter::MakeComposeFilter(sk_ref_sp(cf), + sk_sp<SkColorFilter>(inputCF))); if (newCF) { - return new SkColorFilterImageFilter(newCF, input->getInput(0), cropRect); + return new SkColorFilterImageFilter(newCF.get(), input->getInput(0), cropRect); } } @@ -42,17 +42,13 @@ SkColorFilterImageFilter::SkColorFilterImageFilter(SkColorFilter* cf, SkFlattenable* SkColorFilterImageFilter::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1); - SkAutoTUnref<SkColorFilter> cf(buffer.readColorFilter()); - return Create(cf, common.getInput(0), &common.cropRect()); + sk_sp<SkColorFilter> cf(buffer.readColorFilter()); + return Create(cf.get(), common.getInput(0), &common.cropRect()); } void SkColorFilterImageFilter::flatten(SkWriteBuffer& buffer) const { this->INHERITED::flatten(buffer); - buffer.writeFlattenable(fColorFilter); -} - -SkColorFilterImageFilter::~SkColorFilterImageFilter() { - fColorFilter->unref(); + buffer.writeFlattenable(fColorFilter.get()); } bool SkColorFilterImageFilter::onFilterImageDeprecated(Proxy* proxy, const SkBitmap& source, @@ -94,7 +90,7 @@ bool SkColorFilterImageFilter::onIsColorFilterNode(SkColorFilter** filter) const SkASSERT(1 == this->countInputs()); if (!this->cropRectIsSet()) { if (filter) { - *filter = SkRef(fColorFilter); + *filter = SkRef(fColorFilter.get()); } return true; } |