Make filters use SkImage instead of SkBitmap

src/core/SkCanvas.cpp

Index: src/core/SkCanvas.cpp
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 4c8c2fc16bae0572ba8fda0883f41785d9fa46c6..58a8819820a1632a501187434c92010e584af876 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1111,33 +1111,19 @@ void SkCanvas::internalDrawDevice(SkBaseDevice* srcDev, int x, int y,
         SkIPoint pos = { x - iter.getX(), y - iter.getY() };
         if (filter && !dstDev->canHandleImageFilter(filter)) {
             SkDeviceImageFilterProxy proxy(dstDev, fProps);
-            SkBitmap dst;
+            SkAutoTUnref<const SkImage> dst;
             SkIPoint offset = SkIPoint::Make(0, 0);
             SkAutoTUnref<SkImage> src(srcDev->newImageSnapshot());
             SkMatrix matrix = *iter.fMatrix;
             matrix.postTranslate(SkIntToScalar(-pos.x()), SkIntToScalar(-pos.y()));
-            SkIRect clipBounds = SkIRect::MakeWH(srcDev->width(), srcDev->height());
+            SkIRect clipBounds = SkIRect::MakeWH(src->width(), src->height());
             SkAutoTUnref<SkImageFilter::Cache> cache(dstDev->getImageFilterCache());
             SkImageFilter::Context ctx(matrix, clipBounds, cache.get());
-            SkBitmap srcBitmap;  // TODO: remove once filters accept SkImage
-#if SK_SUPPORT_GPU
-            // TODO: Gpu devices need bitmap that came from gpu, not through
-            // getROPixels. Remove once filters accept SkImage.
-            if (NULL != src->getTexture()) {
-                SkImageFilter::WrapTexture(src->getTexture(), src->width(), src->height(),
-                                           &srcBitmap);
-            } else
-#endif
-            {
-                as_IB(src)->getROPixels(&srcBitmap);
-            }
-            if (!srcBitmap.empty()) {
-                if (filter->filterImage(&proxy, srcBitmap, ctx, &dst, &offset)) {
-                    SkPaint tmpUnfiltered(*paint);
-                    tmpUnfiltered.setImageFilter(NULL);
-                    dstDev->drawSprite(iter, dst, pos.x() + offset.x(), pos.y() + offset.y(),
-                                       tmpUnfiltered);
-                }
+            if (filter->filterImage(&proxy, src, ctx, dst, &offset)) {
+                SkPaint tmpUnfiltered(*paint);
+                tmpUnfiltered.setImageFilter(NULL);
+                dstDev->drawImageAsSprite(iter, *dst, pos.x() + offset.x(), pos.y() + offset.y(),
+                                          tmpUnfiltered);
             }
         } else {
             dstDev->drawDevice(iter, srcDev, pos.x(), pos.y(), *paint);
@@ -1174,18 +1160,19 @@ void SkCanvas::onDrawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint*
         SkIPoint pos = { x - iter.getX(), y - iter.getY() };
         if (filter && !iter.fDevice->canHandleImageFilter(filter)) {
             SkDeviceImageFilterProxy proxy(iter.fDevice, fProps);
-            SkBitmap dst;
+            SkAutoTUnref<SkImage> src(SkNewImageFromBitmap(bitmap, NULL));
+            SkAutoTUnref<const SkImage> dst;
             SkIPoint offset = SkIPoint::Make(0, 0);
             SkMatrix matrix = *iter.fMatrix;
             matrix.postTranslate(SkIntToScalar(-pos.x()), SkIntToScalar(-pos.y()));
             const SkIRect clipBounds = bitmap.bounds();
             SkAutoTUnref<SkImageFilter::Cache> cache(iter.fDevice->getImageFilterCache());
             SkImageFilter::Context ctx(matrix, clipBounds, cache.get());
-            if (filter->filterImage(&proxy, bitmap, ctx, &dst, &offset)) {
+            if (filter->filterImage(&proxy, src, ctx, dst, &offset)) {
                 SkPaint tmpUnfiltered(*paint);
                 tmpUnfiltered.setImageFilter(NULL);
-                iter.fDevice->drawSprite(iter, dst, pos.x() + offset.x(), pos.y() + offset.y(),
-                                         tmpUnfiltered);
+                iter.fDevice->drawImageAsSprite(iter, *dst, pos.x() + offset.x(),
+                                                pos.y() + offset.y(), tmpUnfiltered);
             }
         } else {
             iter.fDevice->drawSprite(iter, bitmap, pos.x(), pos.y(), *paint);
@@ -1205,11 +1192,6 @@ void SkCanvas::onDrawImageAsSprite(const SkImage& image, int x, int y, const SkP
 
     TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawImageAsSprite()");
 
-    SkBitmap src;
-    if (!as_IB(&image)->getROPixels(&src)) {
-        return;
-    }
-
     SkPaint tmp;
     if (NULL == paint) {
         paint = &tmp;
@@ -1223,18 +1205,17 @@ void SkCanvas::onDrawImageAsSprite(const SkImage& image, int x, int y, const SkP
         SkIPoint pos = { x - iter.getX(), y - iter.getY() };
         if (filter && !iter.fDevice->canHandleImageFilter(filter)) {
             SkDeviceImageFilterProxy proxy(iter.fDevice, fProps);
-            SkBitmap dst;
+            SkAutoTUnref<const SkImage> dst;
             SkIPoint offset = SkIPoint::Make(0, 0);
             SkMatrix matrix = *iter.fMatrix;
             matrix.postTranslate(SkIntToScalar(-pos.x()), SkIntToScalar(-pos.y()));
             const SkIRect clipBounds = SkIRect::MakeWH(image.width(), image.height());
             SkAutoTUnref<SkImageFilter::Cache> cache(iter.fDevice->getImageFilterCache());
             SkImageFilter::Context ctx(matrix, clipBounds, cache.get());
-            if (filter->filterImage(&proxy, src, ctx, &dst, &offset)) {
+            if (filter->filterImage(&proxy, &image, ctx, dst, &offset)) {
                 SkPaint tmpUnfiltered(*paint);
                 tmpUnfiltered.setImageFilter(NULL);
-                SkAutoTUnref<SkImage> dstImage(SkNewImageFromBitmap(dst, NULL));
-                iter.fDevice->drawImageAsSprite(iter, *dstImage, pos.x() + offset.x(),
+                iter.fDevice->drawImageAsSprite(iter, *dst, pos.x() + offset.x(),
                                                 pos.y() + offset.y(), tmpUnfiltered);
             }
         } else {