SkShader::asNewEffect Refactoring

src/effects/gradients/SkTwoPointConicalGradient.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTwoPointConicalGradient.h"
 
 #include "SkTwoPointConicalGradient_gpu.h"
@@ skipping 362 matching lines @@
     this->INHERITED::flatten(buffer);
     buffer.writePoint(fCenter1);
     buffer.writePoint(fCenter2);
     buffer.writeScalar(fRadius1);
     buffer.writeScalar(fRadius2);
     buffer.writeBool(fFlippedGrad);
 }
 
 #if SK_SUPPORT_GPU
 
-GrEffectRef* SkTwoPointConicalGradient::asNewEffect(GrContext* context, const SkPaint&,
-                                                    const SkMatrix* localMatrix) const {
+ bool SkTwoPointConicalGradient::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);
     SkASSERT(fPtsToUnit.isIdentity());
 
-    return Gr2PtConicalGradientEffect::Create(context, *this, fTileMode, localMatrix);
+    *grEffect = Gr2PtConicalGradientEffect::Create(context, *this, fTileMode, localMatrix);
+    return true;
 }
 
 #else
 
 GrEffectRef* SkTwoPointConicalGradient::asNewEffect(GrContext*, const SkPaint&,
                                                     const SkMatrix*) const {
     SkDEBUGFAIL("Should not call in GPU-less build");
     return NULL;
 }
 
@@ skipping 17 matching lines @@
     str->appendScalar(fCenter2.fY);
     str->append(") radius2: ");
     str->appendScalar(fRadius2);
     str->append(" ");
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif