Allow single-pass filters (which use asNewEffect()) to participate in the image filter DAG. This w…

src/effects/SkMatrixConvolutionImageFilter.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 "SkMatrixConvolutionImageFilter.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 544 matching lines @@
                                              kernel.get(),
                                              gain,
                                              bias,
                                              target,
                                              tileMode,
                                              convolveAlpha);
 }
 
 bool SkMatrixConvolutionImageFilter::asNewEffect(GrEffectRef** effect,
                                                  GrTexture* texture) const {
-    bool ok = fKernelSize.width() * fKernelSize.height() <= MAX_KERNEL_SIZE;
-    if (ok && effect) {
-        *effect = GrMatrixConvolutionEffect::Create(texture,
-                                                    fKernelSize,
-                                                    fKernel,
-                                                    fGain,
-                                                    fBias,
-                                                     fTarget,
-                                                     fTileMode,
-                                                     fConvolveAlpha);
+    if (!effect) {
+        return fKernelSize.width() * fKernelSize.height() <= MAX_KERNEL_SIZE;
     }
-    return ok;
+    SkASSERT(fKernelSize.width() * fKernelSize.height() <= MAX_KERNEL_SIZE);
+    *effect = GrMatrixConvolutionEffect::Create(texture,
+                                                fKernelSize,
+                                                fKernel,
+                                                fGain,
+                                                fBias,
+                                                fTarget,
+                                                fTileMode,
+                                                fConvolveAlpha);
+    return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #endif