Revert of Remove deprecated paths from image filter infrastructure.

src/core/SkDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorFilter.h"
 #include "SkDevice.h"
 #include "SkDraw.h"
@@ skipping 391 matching lines @@
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
 void SkBaseDevice::drawSpriteWithFilter(const SkDraw& draw, const SkBitmap& bitmap,
                                         int x, int y,
                                         const SkPaint& paint) {
     SkImageFilter* filter = paint.getImageFilter();
     SkASSERT(filter);
 
-    SkImageFilter::DeviceProxy proxy(this);
-    SkIPoint offset = SkIPoint::Make(0, 0);
-    SkMatrix matrix = *draw.fMatrix;
-    matrix.postTranslate(SkIntToScalar(-x), SkIntToScalar(-y));
-    const SkIRect clipBounds = draw.fClip->getBounds().makeOffset(-x, -y);
-    SkAutoTUnref<SkImageFilter::Cache> cache(this->getImageFilterCache());
-    SkImageFilter::Context ctx(matrix, clipBounds, cache.get());
+    if (!this->canHandleImageFilter(filter)) {
+        SkImageFilter::DeviceProxy proxy(this);
+        SkIPoint offset = SkIPoint::Make(0, 0);
+        SkMatrix matrix = *draw.fMatrix;
+        matrix.postTranslate(SkIntToScalar(-x), SkIntToScalar(-y));
+        const SkIRect clipBounds = draw.fClip->getBounds().makeOffset(-x, -y);
+        SkAutoTUnref<SkImageFilter::Cache> cache(this->getImageFilterCache());
+        SkImageFilter::Context ctx(matrix, clipBounds, cache.get());
 
-    sk_sp<SkSpecialImage> srcImg(SkSpecialImage::internal_fromBM(&proxy, bitmap,
-                                                                 &this->surfaceProps()));
-    if (!srcImg) {
-        return; // something disastrous happened
-    }
+        sk_sp<SkSpecialImage> srcImg(SkSpecialImage::internal_fromBM(&proxy, bitmap,
+                                                                     &this->surfaceProps()));
+        if (!srcImg) {
+            return; // something disastrous happened
+        }
 
-    sk_sp<SkSpecialImage> resultImg(filter->filterImage(srcImg.get(), ctx, &offset));
-    if (resultImg) {
-        SkPaint tmpUnfiltered(paint);
-        tmpUnfiltered.setImageFilter(nullptr);
-        SkBitmap resultBM;
-        if (resultImg->internal_getBM(&resultBM)) {
-            // TODO: add drawSprite(SkSpecialImage) to SkDevice? (see skbug.com/5073)
-            this->drawSprite(draw, resultBM, x + offset.x(), y + offset.y(), tmpUnfiltered);
+        sk_sp<SkSpecialImage> resultImg(filter->filterImage(srcImg.get(), ctx, &offset));
+        if (resultImg) {
+            SkPaint tmpUnfiltered(paint);
+            tmpUnfiltered.setImageFilter(nullptr);
+            SkBitmap resultBM;
+            if (resultImg->internal_getBM(&resultBM)) {
+                // TODO: add drawSprite(SkSpecialImage) to SkDevice? (see skbug.com/5073)
+                this->drawSprite(draw, resultBM, x + offset.x(), y + offset.y(), tmpUnfiltered);
+            }
         }
+    } else {
+        this->drawSprite(draw, bitmap, x, y, paint);
     }
 }
 
 uint32_t SkBaseDevice::filterTextFlags(const SkPaint& paint) const {
     uint32_t flags = paint.getFlags();
 
     if (!paint.isLCDRenderText() || !paint.isAntiAlias()) {
         return flags;
     }
 
     if (kUnknown_SkPixelGeometry == fSurfaceProps.pixelGeometry()
         || this->onShouldDisableLCD(paint)) {
 
         flags &= ~SkPaint::kLCDRenderText_Flag;
         flags |= SkPaint::kGenA8FromLCD_Flag;
     }
 
     return flags;
 }
 
 sk_sp<SkSurface> SkBaseDevice::makeSurface(SkImageInfo const&, SkSurfaceProps const&) {
     return nullptr;
 }