Revert of Switch SkBlurImageFilter over to new onFilterImage interface

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 385 matching lines @@
                 m.postConcat(*matrix);
             }
             morphpath(&tmp, *iterPath, meas, m);
             this->drawPath(draw, tmp, iter.getPaint(), nullptr, true);
         }
     }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-void SkBaseDevice::drawBitmapAsSpriteWithImageFilter(const SkDraw& draw, const SkBitmap& bitmap,
-                                                     int x, int y,
-                                                     const SkPaint& paint) {
+void SkBaseDevice::drawBitmapAsSprite(const SkDraw& draw, const SkBitmap& bitmap, int x, int y,
+                                      const SkPaint& paint) {
     SkImageFilter* filter = paint.getImageFilter();
-    SkASSERT(filter);
-
-    if (!this->canHandleImageFilter(filter)) {
+    if (filter && !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));
         if (!srcImg) {
@@ skipping 25 matching lines @@
     if (kUnknown_SkPixelGeometry == fSurfaceProps.pixelGeometry()
         || this->onShouldDisableLCD(paint)) {
 
         flags &= ~SkPaint::kLCDRenderText_Flag;
         flags |= SkPaint::kGenA8FromLCD_Flag;
     }
 
     return flags;
 }