diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-24 07:26:32 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-24 07:26:32 -0700 |
| commit | 2302de920e5434809bd0e85b871a6e002856dfdb (patch) | |
| tree | 895491a700be4a79a3da2faa95dd8f553537bdf8 /src/core/SkCanvas.cpp | |
| parent | 85f9269d9b05c25f3d7b9ac5435f2bf8951e7db3 (diff) | |
Switch new SkImageFilter internal methods over to sk_sp
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1826893002
Review URL: https://codereview.chromium.org/1826893002
Diffstat (limited to 'src/core/SkCanvas.cpp')
| -rw-r--r-- | src/core/SkCanvas.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index f1c1626602..6a11db5ee5 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1412,8 +1412,7 @@ void SkCanvas::internalDrawDevice(SkBaseDevice* srcDev, int x, int y, continue; // something disastrous happened } - SkAutoTUnref<SkSpecialImage> resultImg(filter->filterImage(srcImg.get(), ctx, - &offset)); + sk_sp<SkSpecialImage> resultImg(filter->filterImage(srcImg.get(), ctx, &offset)); if (resultImg) { SkPaint tmpUnfiltered(*paint); tmpUnfiltered.setImageFilter(nullptr); @@ -2265,9 +2264,9 @@ void SkCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, const S if (as_IB(image)->asBitmapForImageFilters(&bitmap)) { SkPoint pt; iter.fMatrix->mapXY(x, y, &pt); - iter.fDevice->drawBitmapAsSpriteWithImageFilter(iter, bitmap, - SkScalarRoundToInt(pt.fX), - SkScalarRoundToInt(pt.fY), pnt); + iter.fDevice->drawSpriteWithFilter(iter, bitmap, + SkScalarRoundToInt(pt.fX), + SkScalarRoundToInt(pt.fY), pnt); } } else { iter.fDevice->drawImage(iter, image, x, y, pnt); @@ -2347,9 +2346,9 @@ void SkCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y, cons if (drawAsSprite && pnt.getImageFilter()) { SkPoint pt; iter.fMatrix->mapXY(x, y, &pt); - iter.fDevice->drawBitmapAsSpriteWithImageFilter(iter, bitmap, - SkScalarRoundToInt(pt.fX), - SkScalarRoundToInt(pt.fY), pnt); + iter.fDevice->drawSpriteWithFilter(iter, bitmap, + SkScalarRoundToInt(pt.fX), + SkScalarRoundToInt(pt.fY), pnt); } else { iter.fDevice->drawBitmap(iter, bitmap, matrix, looper.paint()); } |