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

gm/dcshader.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #if SK_SUPPORT_GPU
 #include "GrFragmentProcessor.h"
 #include "GrCoordTransform.h"
-#include "effects/GrExtractAlphaFragmentProcessor.h"
 #include "gl/GrGLProcessor.h"
 #include "gl/builders/GrGLProgramBuilder.h"
 #include "Resources.h"
 #include "SkReadBuffer.h"
 #include "SkShader.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 #include "SkWriteBuffer.h"
 
 namespace skiagm {
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class DCShader : public SkShader {
 public:
     DCShader(const SkMatrix& matrix) : fDeviceMatrix(matrix) {}
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(DCShader);
 
     void flatten(SkWriteBuffer& buf) const override {
         buf.writeMatrix(fDeviceMatrix);
     }
 
-    const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM,
-        const SkMatrix* localMatrix, SkFilterQuality, GrProcessorDataManager*) const override;
+    bool asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix& viewM,
+                             const SkMatrix* localMatrix, GrColor* color, GrProcessorDataManager*,
+                             GrFragmentProcessor** fp) const override;
 
 #ifndef SK_IGNORE_TO_STRING
     void toString(SkString* str) const override {
         str->appendf("DCShader: ()");
     }
 #endif
 
 private:
     const SkMatrix fDeviceMatrix;
 };
@@ skipping 38 matching lines @@
 
 private:
     void onGetGLProcessorKey(const GrGLSLCaps& caps,
                              GrProcessorKeyBuilder* b) const override {}
 
     bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
     GrCoordTransform fDeviceTransform;
 };
 
-const GrFragmentProcessor* DCShader::asFragmentProcessor(GrContext*, const SkMatrix& viewM,
-    const SkMatrix* localMatrix, SkFilterQuality, GrProcessorDataManager* procDataManager) const {
-    SkAutoTUnref<const GrFragmentProcessor> inner(new DCFP(procDataManager, fDeviceMatrix)); 
-    return GrExtractAlphaFragmentProcessor::Create(inner);
+bool DCShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix& viewM,
+                                   const SkMatrix* localMatrix, GrColor* color,
+                                   GrProcessorDataManager* procDataManager,
+                                   GrFragmentProcessor** fp) const {
+    *fp = new DCFP(procDataManager, fDeviceMatrix);
+    *color = GrColorPackA4(paint.getAlpha());
+    return true;
 }
 
 class DCShaderGM : public GM {
 public:
     DCShaderGM() {
         this->setBGColor(sk_tool_utils::color_to_565(0xFFAABBCC));
     }
 
     ~DCShaderGM() override {
         for (int i = 0; i < fPrims.count(); ++i) {
@@ skipping 173 matching lines @@
     };
 
     SkTArray<Prim*> fPrims;
 
     typedef GM INHERITED;
 };
 
 DEF_GM(return new DCShaderGM;)
 }
 #endif