SkShader::asNewEffect Refactoring

src/effects/gradients/SkRadialGradient.cpp

Index: src/effects/gradients/SkRadialGradient.cpp
diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp
index 3b9d1758c413d9bf7e671f88d3a419edb0839ec3..f58e3231452da23e32cced8f295fc7c74c2c370b 100644
--- a/src/effects/gradients/SkRadialGradient.cpp
+++ b/src/effects/gradients/SkRadialGradient.cpp
@@ -538,7 +538,10 @@ GrEffectRef* GrRadialGradient::TestCreate(SkRandom* random,
                                                                  colors, stops, colorCount,
                                                                  tm));
     SkPaint paint;
-    return shader->asNewEffect(context, paint, NULL);
+    GrColor grColor;
+    GrEffectRef* effect;
+    shader->asNewEffect(context, paint, &grColor, &effect, NULL);
+    return effect;
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -559,23 +562,24 @@ void GrGLRadialGradient::emitCode(GrGLShaderBuilder* builder,
 
 /////////////////////////////////////////////////////////////////////
 
-GrEffectRef* SkRadialGradient::asNewEffect(GrContext* context, const SkPaint&,
-                                           const SkMatrix* localMatrix) const {
+bool SkRadialGradient::asNewEffect(GrContext* context, const SkPaint& paint, GrColor* grColor,
+                                   GrEffectRef** grEffect, const SkMatrix* localMatrix) const {

[jvanverth1, 2014/06/05 17:36:31]

grColor never gets set by this method

     SkASSERT(NULL != context);
 
     SkMatrix matrix;
     if (!this->getLocalMatrix().invert(&matrix)) {
-        return NULL;
+        return false;
     }
     if (localMatrix) {
         SkMatrix inv;
         if (!localMatrix->invert(&inv)) {
-            return NULL;
+            return false;
         }
         matrix.postConcat(inv);
     }
     matrix.postConcat(fPtsToUnit);
-    return GrRadialGradient::Create(context, *this, matrix, fTileMode);
+    *grEffect = GrRadialGradient::Create(context, *this, matrix, fTileMode);
+    return true;
 }
 
 #else