diff options
| author |  reed <reed@google.com> | 2015-06-09 08:18:39 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-09 08:18:40 -0700 |
| commit | 2c55d7b7f3c2c834085d019bf6b1519b315c8aa1 (patch) | |
| tree | e8b584e6f7f085132c2333e87b060e65f7f77ca8 /src/core/SkCanvas.cpp | |
| parent | ded9a6f794a43fc9ec7b370559ba0699c061628d (diff) | |
remove subclassing from ImageFilter::Proxy
BUG=skia:
Review URL: https://codereview.chromium.org/1172693002
Diffstat (limited to 'src/core/SkCanvas.cpp')
| -rw-r--r-- | src/core/SkCanvas.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 26b76df9be..30778fc130 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -9,7 +9,6 @@ #include "SkCanvasPriv.h" #include "SkBitmapDevice.h" #include "SkColorFilter.h" -#include "SkDeviceImageFilterProxy.h" #include "SkDeviceProperties.h" #include "SkDraw.h" #include "SkDrawable.h" @@ -1245,7 +1244,7 @@ void SkCanvas::internalDrawDevice(SkBaseDevice* srcDev, int x, int y, SkImageFilter* filter = paint->getImageFilter(); SkIPoint pos = { x - iter.getX(), y - iter.getY() }; if (filter && !dstDev->canHandleImageFilter(filter)) { - SkDeviceImageFilterProxy proxy(dstDev, fProps); + SkImageFilter::Proxy proxy(dstDev, fProps); SkBitmap dst; SkIPoint offset = SkIPoint::Make(0, 0); const SkBitmap& src = srcDev->accessBitmap(false); @@ -1297,7 +1296,7 @@ void SkCanvas::onDrawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint* SkImageFilter* filter = paint->getImageFilter(); SkIPoint pos = { x - iter.getX(), y - iter.getY() }; if (filter && !iter.fDevice->canHandleImageFilter(filter)) { - SkDeviceImageFilterProxy proxy(iter.fDevice, fProps); + SkImageFilter::Proxy proxy(iter.fDevice, fProps); SkBitmap dst; SkIPoint offset = SkIPoint::Make(0, 0); SkMatrix matrix = *iter.fMatrix; |