Revert of Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor*

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 341 matching lines @@
     buffer.writePoint(fCenter1);
     buffer.writePoint(fCenter2);
     buffer.writeScalar(fRadius1);
     buffer.writeScalar(fRadius2);
     buffer.writeBool(fFlippedGrad);
 }
 
 #if SK_SUPPORT_GPU
 
 #include "SkGr.h"
-#include "effects/GrExtractAlphaFragmentProcessor.h"
 
-const GrFragmentProcessor* SkTwoPointConicalGradient::asFragmentProcessor(GrContext* context,
-    const SkMatrix& viewM, const SkMatrix* localMatrix, SkFilterQuality,
-    GrProcessorDataManager* procDataManager)  const {
+bool SkTwoPointConicalGradient::asFragmentProcessor(GrContext* context,
+                                                    const SkPaint& paint,
+                                                    const SkMatrix& viewM,
+                                                    const SkMatrix* localMatrix,
+                                                    GrColor* paintColor,
+                                                    GrProcessorDataManager* procDataManager,
+                                                    GrFragmentProcessor** fp)  const {
     SkASSERT(context);
     SkASSERT(fPtsToUnit.isIdentity());
-    SkAutoTUnref<const GrFragmentProcessor> inner(
-        Gr2PtConicalGradientEffect::Create(context, procDataManager, *this, fTileMode,
-                                            localMatrix));
-    return GrExtractAlphaFragmentProcessor::Create(inner);
+
+    *fp = Gr2PtConicalGradientEffect::Create(context, procDataManager, *this, fTileMode,
+                                             localMatrix);
+    *paintColor = SkColor2GrColorJustAlpha(paint.getColor());
+    return true;
+}
+
+#else
+
+bool SkTwoPointConicalGradient::asFragmentProcessor(GrContext*, const SkPaint&,
+                                                    const SkMatrix&, const SkMatrix*,
+                                                    GrColor*, GrProcessorDataManager*,
+                                                    GrFragmentProcessor**)  const {
+    SkDEBUGFAIL("Should not call in GPU-less build");
+    return false;
 }
 
 #endif
 
 #ifndef SK_IGNORE_TO_STRING
 void SkTwoPointConicalGradient::toString(SkString* str) const {
     str->append("SkTwoPointConicalGradient: (");
 
     str->append("center1: (");
     str->appendScalar(fCenter1.fX);
     str->append(", ");
     str->appendScalar(fCenter1.fY);
     str->append(") radius1: ");
     str->appendScalar(fRadius1);
     str->append(" ");
 
     str->append("center2: (");
     str->appendScalar(fCenter2.fX);
     str->append(", ");
     str->appendScalar(fCenter2.fY);
     str->append(") radius2: ");
     str->appendScalar(fRadius2);
     str->append(" ");
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif