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

src/core/SkShader.cpp

 /*
  * 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.
  */
 
 #include "SkAtomics.h"
 #include "SkBitmapProcShader.h"
 #include "SkColorShader.h"
@@ skipping 196 matching lines @@
 //////////////////////////////////////////////////////////////////////////////
 
 SkShader::BitmapType SkShader::asABitmap(SkBitmap*, SkMatrix*, TileMode*) const {
     return kNone_BitmapType;
 }
 
 SkShader::GradientType SkShader::asAGradient(GradientInfo* info) const {
     return kNone_GradientType;
 }
 
-bool SkShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*,
-                                   GrColor*, GrProcessorDataManager*,
-                                   GrFragmentProcessor**)  const {
-    return false;
+const GrFragmentProcessor* SkShader::asFragmentProcessor(GrContext*, const SkMatrix&,
+                                                         const SkMatrix*, SkFilterQuality,
+                                                         GrProcessorDataManager*)  const {
+    return nullptr;
 }
 
 SkShader* SkShader::refAsALocalMatrixShader(SkMatrix*) const {
     return nullptr;
 }
 
 SkShader* SkShader::CreateEmptyShader() { return new SkEmptyShader; }
 
 SkShader* SkShader::CreateColorShader(SkColor color) { return new SkColorShader(color); }
 
@@ skipping 97 matching lines @@
         }
         info->fColorCount = 1;
         info->fTileMode = SkShader::kRepeat_TileMode;
     }
     return kColor_GradientType;
 }
 
 #if SK_SUPPORT_GPU
 
 #include "SkGr.h"
-
-bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix&,
-                                        const SkMatrix*, GrColor* paintColor,
-                                        GrProcessorDataManager*, GrFragmentProcessor** fp) const {
-    *fp = nullptr;
-    SkColor skColor = fColor;
-    U8CPU newA = SkMulDiv255Round(SkColorGetA(fColor), paint.getAlpha());
-    *paintColor = SkColor2GrColor(SkColorSetA(skColor, newA));
-    return true;
-}
-
-#else
-
-bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
-                                        const SkMatrix*, GrColor*, GrProcessorDataManager*,
-                                        GrFragmentProcessor**) const {
-    SkDEBUGFAIL("Should not call in GPU-less build");
-    return false;
+#include "effects/GrConstColorProcessor.h"
+const GrFragmentProcessor* SkColorShader::asFragmentProcessor(GrContext*, const SkMatrix&,
+                                                              const SkMatrix*, SkFilterQuality,
+                                                              GrProcessorDataManager*) const {
+    GrColor color = SkColor2GrColor(fColor);
+    return GrConstColorProcessor::Create(color, GrConstColorProcessor::kModulateA_InputMode);
 }
 
 #endif
 
 #ifndef SK_IGNORE_TO_STRING
 void SkColorShader::toString(SkString* str) const {
     str->append("SkColorShader: (");
 
     str->append("Color: ");
     str->appendHex(fColor);
@@ skipping 14 matching lines @@
 #include "SkEmptyShader.h"
 
 void SkEmptyShader::toString(SkString* str) const {
     str->append("SkEmptyShader: (");
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif