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

src/effects/SkMagnifierImageFilter.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 "SkBitmap.h"
 #include "SkMagnifierImageFilter.h"
 #include "SkColorPriv.h"
@@ skipping 194 matching lines @@
                                            GrTexture** textures) {
     const int kMaxWidth = 200;
     const int kMaxHeight = 200;
     const int kMaxInset = 20;
     uint32_t width = random->nextULessThan(kMaxWidth);
     uint32_t height = random->nextULessThan(kMaxHeight);
     uint32_t x = random->nextULessThan(kMaxWidth - width);
     uint32_t y = random->nextULessThan(kMaxHeight - height);
     SkScalar inset = SkIntToScalar(random->nextULessThan(kMaxInset));
 
-    SkAutoTUnref<SkImageFilter> filter(
+    SkAutoTUnref<SkMagnifierImageFilter> filter(
             new SkMagnifierImageFilter(
                 SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(y),
                                  SkIntToScalar(width), SkIntToScalar(height)),
                 inset));
-    GrEffectRef* effect;
-    filter->asNewEffect(&effect, textures[0]);
+    GrEffectRef* effect = filter->asNewEffect(textures[0]);
     GrAssert(NULL != effect);
     return effect;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 const GrBackendEffectFactory& GrMagnifierEffect::getFactory() const {
     return GrTBackendEffectFactory<GrMagnifierEffect>::getInstance();
 }
 
@@ skipping 24 matching lines @@
     fSrcRect = SkRect::MakeXYWH(x, y, width, height);
     fInset = buffer.readScalar();
 }
 
 // FIXME:  implement single-input semantics
 SkMagnifierImageFilter::SkMagnifierImageFilter(SkRect srcRect, SkScalar inset)
     : INHERITED(0), fSrcRect(srcRect), fInset(inset) {
     SkASSERT(srcRect.x() >= 0 && srcRect.y() >= 0 && inset >= 0);
 }
 
-bool SkMagnifierImageFilter::asNewEffect(GrEffectRef** effect, GrTexture* texture) const {
 #if SK_SUPPORT_GPU
-    if (effect) {
-      *effect = GrMagnifierEffect::Create(texture,
-                                          fSrcRect.x() / texture->width(),
-                                          fSrcRect.y() / texture->height(),
-                                          texture->width() / fSrcRect.width(),
-                                          texture->height() / fSrcRect.height(),
-                                          fInset / texture->width(),
-                                          fInset / texture->height());
-    }
-    return true;
-#else
-    return false;
+GrEffectRef* SkMagnifierImageFilter::asNewEffect(GrTexture* texture) const {
+  return GrMagnifierEffect::Create(texture,
+                                   fSrcRect.x() / texture->width(),
+                                   fSrcRect.y() / texture->height(),
+                                   texture->width() / fSrcRect.width(),
+                                   texture->height() / fSrcRect.height(),
+                                   fInset / texture->width(),
+                                   fInset / texture->height());
+}
 #endif
-}
 
 void SkMagnifierImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeScalar(fSrcRect.x());
     buffer.writeScalar(fSrcRect.y());
     buffer.writeScalar(fSrcRect.width());
     buffer.writeScalar(fSrcRect.height());
     buffer.writeScalar(fInset);
 }
 
@@ skipping 55 matching lines @@
 
             int x_val = SkMin32(SkScalarFloorToInt(x_interp), width - 1);
             int y_val = SkMin32(SkScalarFloorToInt(y_interp), height - 1);
 
             *dptr = sptr[y_val * width + x_val];
             dptr++;
         }
     }
     return true;
 }