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

src/effects/SkMagnifierImageFilter.cpp

Index: src/effects/SkMagnifierImageFilter.cpp
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index f6675c4776c20c268bfd8267954b4dbe6568e226..2c553db86e4c108d912ef612516472755e7f2b59 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -212,13 +212,12 @@ GrEffectRef* GrMagnifierEffect::TestCreate(SkMWCRandom* random,
     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;
 }
@@ -263,22 +262,17 @@ SkMagnifierImageFilter::SkMagnifierImageFilter(SkRect srcRect, SkScalar 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;
-#endif
+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);