SkShader::asNewEffect Refactoring

include/core/SkShader.h

Index: include/core/SkShader.h
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 82efab27410439b369d2186012354f480232fc0b..9243410b3b3f8bf0610456d4dc0b94c22a2b27a8 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -14,6 +14,7 @@
 #include "SkMask.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
+#include "../gpu/GrColor.h"
 
 class SkPath;
 class SkPicture;
@@ -379,8 +380,8 @@ public:
      *  color. The GrContext may be used by the effect to create textures. The GPU device does not
      *  call createContext. Instead we pass the SkPaint here in case the shader needs paint info.
      */
-    virtual GrEffectRef* asNewEffect(GrContext* context, const SkPaint& paint,
-                                     const SkMatrix* localMatrixOrNull) const;
+    virtual bool asNewEffect(GrContext* context, const SkPaint& paint, GrColor* grColor,

[jvanverth1, 2014/06/05 17:03:07]

I'd probably put grColor and grEffect at the end of the parameter list.
Otherwise you're mixing inputs and outputs. Also, you should change the comment
to reflect the new parameter list. E.g. a return value of 'false' means that it
did not create a ref or set a color.

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

Done.

+                             GrEffectRef** grEffect, const SkMatrix* localMatrixOrNull) const;
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     /**