diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-31 09:05:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-31 09:05:49 -0700 |
| commit | 51a315eff9b86bd60e7884240c4efc199129d37a (patch) | |
| tree | 4e08f4a93e4359dc808c1302557337dad88bfabc /src | |
| parent | 865a289bfec169cb19970c734e9aa855c267f060 (diff) | |
Update SkOffsetImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842193002
Review URL: https://codereview.chromium.org/1842193002
Diffstat (limited to 'src')
| -rw-r--r-- | src/effects/SkOffsetImageFilter.cpp | 7 | ||||
| -rw-r--r-- | src/effects/SkTileImageFilter.cpp | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/effects/SkOffsetImageFilter.cpp b/src/effects/SkOffsetImageFilter.cpp index a2de25e7de..69f1895402 100644 --- a/src/effects/SkOffsetImageFilter.cpp +++ b/src/effects/SkOffsetImageFilter.cpp @@ -86,7 +86,7 @@ SkFlattenable* SkOffsetImageFilter::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1); SkPoint offset; buffer.readPoint(&offset); - return Create(offset.x(), offset.y(), common.getInput(0).get(), &common.cropRect()); + return Make(offset.x(), offset.y(), common.getInput(0), &common.cropRect()).release(); } void SkOffsetImageFilter::flatten(SkWriteBuffer& buffer) const { @@ -94,9 +94,10 @@ void SkOffsetImageFilter::flatten(SkWriteBuffer& buffer) const { buffer.writePoint(fOffset); } -SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter* input, +SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy, + sk_sp<SkImageFilter> input, const CropRect* cropRect) - : INHERITED(1, &input, cropRect) { + : INHERITED(&input, 1, cropRect) { fOffset.set(dx, dy); } diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp index a4129a5ad0..ab127f6fdf 100644 --- a/src/effects/SkTileImageFilter.cpp +++ b/src/effects/SkTileImageFilter.cpp @@ -28,9 +28,10 @@ SkImageFilter* SkTileImageFilter::Create(const SkRect& srcRect, const SkRect& ds return SkSafeRef(input); } CropRect cropRect(ir); - return SkOffsetImageFilter::Create(dstRect.x() - srcRect.x(), - dstRect.y() - srcRect.y(), - input, &cropRect); + return SkOffsetImageFilter::Make(dstRect.x() - srcRect.x(), + dstRect.y() - srcRect.y(), + sk_ref_sp<SkImageFilter>(input), + &cropRect).release(); } return new SkTileImageFilter(srcRect, dstRect, input); } |