Revert of Cleanup of shader building system

include/gpu/GrPaint.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrPaint_DEFINED
@@ skipping 74 matching lines @@
     bool isDither() const { return fDither; }
 
     /**
      * Appends an additional color processor to the color computation.
      */
     const GrFragmentProcessor* addColorProcessor(const GrFragmentProcessor* fp) {
         SkASSERT(fp);
         if (!fp->willUseInputColor()) {
             fColorStages.reset();
         }
-        SkNEW_APPEND_TO_TARRAY(&fColorStages, GrFragmentStage, (fp));
+        SkNEW_APPEND_TO_TARRAY(&fColorStages, GrProcessorStage, (fp));
         return fp;
     }
 
     /**
      * Appends an additional coverage processor to the coverage computation.
      */
     const GrFragmentProcessor* addCoverageProcessor(const GrFragmentProcessor* fp) {
         SkASSERT(fp);
         if (!fp->willUseInputColor()) {
             fCoverageStages.reset();
         }
-        SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrFragmentStage, (fp));
+        SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrProcessorStage, (fp));
         return fp;
     }
 
     /**
      * Helpers for adding color or coverage effects that sample a texture. The matrix is applied
      * to the src space position to compute texture coordinates.
      */
     void addColorTextureProcessor(GrTexture*, const SkMatrix&);
     void addCoverageTextureProcessor(GrTexture*, const SkMatrix&);
     void addColorTextureProcessor(GrTexture*, const SkMatrix&, const GrTextureParams&);
@@ skipping 122 matching lines @@
         fCoverage = 0xff;
     }
 
     void resetStages() {
         fColorStages.reset();
         fCoverageStages.reset();
     }
 };
 
 #endif