Image filters: simplify filterInputGPU().

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 478 matching lines @@
     // matrix with no clip and that the matrix, clip, and render target set before this function was
     // called are restored before we return to the caller.
     GrContext* context = src.getTexture()->getContext();
 
     SizeConstraint constraint = origCtx.sizeConstraint();
     if (relaxSizeConstraint && (kExact_SizeConstraint == constraint)) {
         constraint = kApprox_SizeConstraint;
     }
     Context ctx(origCtx.ctm(), origCtx.clipBounds(), origCtx.cache(), constraint);
 
-    if (input->canFilterImageGPU()) {
-        return input->filterImageGPU(proxy, src, ctx, result, offset);
+    if (input->filterImage(proxy, src, ctx, result, offset)) {
+        if (!result->getTexture()) {
+            const SkImageInfo info = result->info();
+            if (kUnknown_SkColorType == info.colorType()) {
+                return false;
+            }
+            SkAutoTUnref<GrTexture> resultTex(
+                GrRefCachedBitmapTexture(context, *result,GrTextureParams::ClampNoFilter()));
+            result->setPixelRef(new SkGrPixelRef(info, resultTex))->unref();
+        }
+        return true;
     } else {
-        if (input->filterImage(proxy, src, ctx, result, offset)) {
-            if (!result->getTexture()) {
-                const SkImageInfo info = result->info();
-                if (kUnknown_SkColorType == info.colorType()) {
-                    return false;
-                }
-                SkAutoTUnref<GrTexture> resultTex(
-                    GrRefCachedBitmapTexture(context, *result,GrTextureParams::ClampNoFilter()));
-                result->setPixelRef(new SkGrPixelRef(info, resultTex))->unref();
-            }
-            return true;
-        } else {
-            return false;
-        }
+        return false;
     }
 }
 #endif
 
 namespace {
 
 class CacheImpl : public SkImageFilter::Cache {
 public:
     CacheImpl(size_t maxBytes) : fMaxBytes(maxBytes), fCurrentBytes(0) {
     }
@@ skipping 106 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);
 }