SkShader::asNewEffect Refactoring

include/core/SkShader.h

 /*
  * Copyright 2006 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.
  */
 
 
 #ifndef SkShader_DEFINED
 #define SkShader_DEFINED
 
 #include "SkBitmap.h"
 #include "SkFlattenable.h"
 #include "SkMask.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
+#include "../gpu/GrColor.h"
 
 class SkPath;
 class SkPicture;
 class SkXfermode;
 class GrContext;
 class GrEffectRef;
 
 /** \class SkShader
  *
  *  Shaders specify the source color(s) for what is being drawn. If a paint
@@ skipping 339 matching lines @@
     struct ComposeRec {
         const SkShader*     fShaderA;
         const SkShader*     fShaderB;
         const SkXfermode*   fMode;
     };
 
     virtual bool asACompose(ComposeRec* rec) const { return false; }
 
 
     /**
      *  If the shader subclass has a GrEffect implementation, this resturns the effect to install.

[bsalomon, 2014/06/05 17:32:44]

These comments need updating.

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

Done.

      *  The incoming color to the effect has r=g=b=a all extracted from the SkPaint's alpha.
      *  The output color should be the computed SkShader premul color modulated by the incoming
      *  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
     /**
      *  If the shader is a custom shader which has data the caller might want, call this function
      *  to get that data.
      */
     virtual bool asACustomShader(void** customData) const { return false; }
 #endif
 
     //////////////////////////////////////////////////////////////////////////
@@ skipping 67 matching lines @@
      */
     virtual Context* onCreateContext(const ContextRec&, void* storage) const;
 
 private:
     SkMatrix fLocalMatrix;
 
     typedef SkFlattenable INHERITED;
 };
 
 #endif