| Index: src/core/SkCanvas.cpp
 | 
| diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
 | 
| index 4952ae25811378f19178585dcd3708b2dfdc7f25..6914963cb9e1fc738f71773af60ffb7fc7759849 100644
 | 
| --- a/src/core/SkCanvas.cpp
 | 
| +++ b/src/core/SkCanvas.cpp
 | 
| @@ -1300,7 +1300,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)) {
 | 
| -            SkImageFilter::Proxy proxy(dstDev);
 | 
| +            SkImageFilter::DeviceProxy proxy(dstDev);
 | 
|              SkBitmap dst;
 | 
|              SkIPoint offset = SkIPoint::Make(0, 0);
 | 
|              const SkBitmap& src = srcDev->accessBitmap(false);
 | 
| @@ -1352,7 +1352,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)) {
 | 
| -            SkImageFilter::Proxy proxy(iter.fDevice);
 | 
| +            SkImageFilter::DeviceProxy proxy(iter.fDevice);
 | 
|              SkBitmap dst;
 | 
|              SkIPoint offset = SkIPoint::Make(0, 0);
 | 
|              SkMatrix matrix = *iter.fMatrix;
 | 
| 
 |