diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-24 05:01:23 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-24 05:01:23 -0700 |
| commit | 1579e3c376a9ee8c694a64f9c87457cea13ba442 (patch) | |
| tree | 1582fd026d9ca7e81be3d8eb11b573887cba0a3a /src/core/SkCanvas.cpp | |
| parent | 910f7ec7e79cd051f69b47c3e19d4fda2adbcef4 (diff) | |
Switch SkBlurImageFilter over to new onFilterImage interface
This CL relies on:
https://codereview.chromium.org/1787883002/ (Add SkSpecialImage::extractSubset & NewFromPixmap)
https://codereview.chromium.org/1808743003/ (Allow SkGpuDevice::drawSprite to handle subset SkBitmaps)
https://codereview.chromium.org/1813813002/ (Add SkSpecialImage::makeTextureImage entry point)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1785643003
Committed: https://skia.googlesource.com/skia/+/3c935bc87020bfd19a08922f7394db3a801d168b
Review URL: https://codereview.chromium.org/1785643003
Diffstat (limited to 'src/core/SkCanvas.cpp')
| -rw-r--r-- | src/core/SkCanvas.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 7c1c07b5f2..f1c1626602 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -2265,9 +2265,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->drawBitmapAsSprite(iter, bitmap, - SkScalarRoundToInt(pt.fX), - SkScalarRoundToInt(pt.fY), pnt); + iter.fDevice->drawBitmapAsSpriteWithImageFilter(iter, bitmap, + SkScalarRoundToInt(pt.fX), + SkScalarRoundToInt(pt.fY), pnt); } } else { iter.fDevice->drawImage(iter, image, x, y, pnt); @@ -2347,9 +2347,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->drawBitmapAsSprite(iter, bitmap, - SkScalarRoundToInt(pt.fX), - SkScalarRoundToInt(pt.fY), pnt); + iter.fDevice->drawBitmapAsSpriteWithImageFilter(iter, bitmap, + SkScalarRoundToInt(pt.fX), + SkScalarRoundToInt(pt.fY), pnt); } else { iter.fDevice->drawBitmap(iter, bitmap, matrix, looper.paint()); } |