Revert of Remove GrStagedProcessor, remove the word Stage as it applies to FPs

src/gpu/effects/GrConfigConversionEffect.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 "GrConfigConversionEffect.h"
 #include "GrContext.h"
 #include "GrDrawContext.h"
@@ skipping 214 matching lines @@
                             SkMatrix::I())));
         SkAutoTUnref<GrFragmentProcessor> upmToPM(
                 SkNEW_ARGS(GrConfigConversionEffect,
                            (paint2.getProcessorDataManager(), readTex, false, *upmToPMRule,
                             SkMatrix::I())));
         SkAutoTUnref<GrFragmentProcessor> pmToUPM2(
                 SkNEW_ARGS(GrConfigConversionEffect,
                            (paint3.getProcessorDataManager(), tempTex, false, *pmToUPMRule,
                             SkMatrix::I())));
 
-        paint1.addColorFragmentProcessor(pmToUPM1);
+        paint1.addColorProcessor(pmToUPM1);
 
 
         GrDrawContext* readDrawContext = context->drawContext();
         if (!readDrawContext) {
             failed = true;
             break;
         }
 
         readDrawContext->drawNonAARectToRect(readTex->asRenderTarget(),
                                              GrClip::WideOpen(),
                                              paint1,
                                              SkMatrix::I(),
                                              kDstRect,
                                              kSrcRect);
 
         readTex->readPixels(0, 0, 256, 256, kRGBA_8888_GrPixelConfig, firstRead);
 
-        paint2.addColorFragmentProcessor(upmToPM);
+        paint2.addColorProcessor(upmToPM);
 
         GrDrawContext* tempDrawContext = context->drawContext();
         if (!tempDrawContext) {
             failed = true;
             break;
         }
         tempDrawContext->drawNonAARectToRect(tempTex->asRenderTarget(),
                                              GrClip::WideOpen(),
                                              paint2,
                                              SkMatrix::I(),
                                              kDstRect,
                                              kSrcRect);
 
-        paint3.addColorFragmentProcessor(pmToUPM2);
+        paint3.addColorProcessor(pmToUPM2);
 
         readDrawContext = context->drawContext();
         if (!readDrawContext) {
             failed = true;
             break;
         }
 
         readDrawContext->drawNonAARectToRect(readTex->asRenderTarget(),
                                              GrClip::WideOpen(),
                                              paint3,
@@ skipping 36 matching lines @@
             // The PM conversions assume colors are 0..255
             return NULL;
         }
         return SkNEW_ARGS(GrConfigConversionEffect, (procDataManager,
                                                      texture,
                                                      swapRedAndBlue,
                                                      pmConversion,
                                                      matrix));
     }
 }