SkShader::asNewEffect Refactoring

src/effects/gradients/SkLinearGradient.cpp

Index: src/effects/gradients/SkLinearGradient.cpp
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 4766364e8db46b9f5a40fb1a4416b73691a31c9f..c06dd9a3f5558fd3d8fc56a6200dcb1bc4bd316d 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -527,7 +527,10 @@ GrEffectRef* GrLinearGradient::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;
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -547,29 +550,32 @@ void GrGLLinearGradient::emitCode(GrGLShaderBuilder* builder,
 
 /////////////////////////////////////////////////////////////////////
 
-GrEffectRef* SkLinearGradient::asNewEffect(GrContext* context, const SkPaint&,
-                                           const SkMatrix* localMatrix) const {
+bool SkLinearGradient::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

[dandov, 2014/06/06 21:50:43]

Done.

     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 GrLinearGradient::Create(context, *this, matrix, fTileMode);
+    *grEffect = GrLinearGradient::Create(context, *this, matrix, fTileMode);
+    return true;
 }
 
 #else
 
-GrEffectRef* SkLinearGradient::asNewEffect(GrContext*, const SkPaint&, const SkMatrix*) const {
+bool SkLinearGradient:::asNewEffect(GrContext*, const SkPaint&, const GrColor&,
+                                    GrEffectRef**, const SkMatrix*)  const {
     SkDEBUGFAIL("Should not call in GPU-less build");
-    return NULL;
+    *grEffect = NULL;
+    return false;
 }
 
 #endif