Revert of Matrix convolution bounds fix; affectsTransparentBlack fixes.

src/core/SkImageFilter.cpp

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImageFilter.h"
 
 #include "SkBitmap.h"
@@ skipping 291 matching lines @@
             SkRect bounds;
             input->computeFastBounds(src, &bounds);
             dst->join(bounds);
         } else {
             dst->join(src);
         }
     }
 }
 
 bool SkImageFilter::canComputeFastBounds() const {
+    if (this->affectsTransparentBlack()) {
+        return false;
+    }
     for (int i = 0; i < fInputCount; i++) {
         SkImageFilter* input = this->getInput(i);
         if (input && !input->canComputeFastBounds()) {
             return false;
         }
     }
     return true;
 }
 
+bool SkImageFilter::affectsTransparentBlack() const {
+    return false;
+}
+
 bool SkImageFilter::onFilterImage(Proxy*, const SkBitmap&, const Context&,
                                   SkBitmap*, SkIPoint*) const {
     return false;
 }
 
 bool SkImageFilter::canFilterImageGPU() const {
     return this->asFragmentProcessor(nullptr, nullptr, SkMatrix::I(), SkIRect());
 }
 
 bool SkImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
@@ skipping 46 matching lines @@
             drawContext->fillRectToRect(clip, paint, SkMatrix::I(), dstRect, srcRect);
 
             WrapTexture(dst, bounds.width(), bounds.height(), result);
             return true;
         }
     }
 #endif
     return false;
 }
 
-bool SkImageFilter::asAColorFilter(SkColorFilter** filterPtr) const {
-    SkASSERT(nullptr != filterPtr);
-    return this->countInputs() > 0 &&
-           NULL == this->getInput(0) &&
-           this->isColorFilterNode(filterPtr) &&
-           !(*filterPtr)->affectsTransparentBlack();
-}
-
 bool SkImageFilter::applyCropRect(const Context& ctx, const SkBitmap& src,
                                   const SkIPoint& srcOffset, SkIRect* dstBounds,
                                   SkIRect* srcBounds) const {
     SkIRect storage;
     if (!srcBounds) {
         srcBounds = &storage;
     }
     src.getBounds(srcBounds);
     srcBounds->offset(srcOffset);
     return fCropRect.applyTo(*srcBounds, ctx, dstBounds) && srcBounds->intersect(*dstBounds);
@@ skipping 229 matching lines @@
     }
     return dev;
 }
 
 bool SkImageFilter::DeviceProxy::filterImage(const SkImageFilter* filter, const SkBitmap& src,
                                        const SkImageFilter::Context& ctx,
                                        SkBitmap* result, SkIPoint* offset) {
     return fDevice->filterImage(filter, src, ctx, result, offset);
 }