commit ac856c97acc84dcb54d9cdb068ec8a02b8869647
author bsalomon <bsalomon@google.com> Thu Aug 27 06:30:17 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 27 06:30:17 2015 -0700
tree 6ae028321a4e2f179918390a03788f3e598545e5
parent a04c650459280363454da3b43ae910b8593434c8

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

Committed: https://skia.googlesource.com/skia/+/24243446cdf7b7e4e132c2a0c387c7723777e0c7

Review URL: https://codereview.chromium.org/1307223004

src/gpu/SkGr.cpp

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index ef8460b..f55aa6a 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -469,7 +469,7 @@
         yuvToRgbProcessor(GrYUVtoRGBEffect::Create(paint.getProcessorDataManager(), yuvTextures[0],
                                                    yuvTextures[1], yuvTextures[2],
                                                    yuvInfo.fSize, yuvInfo.fColorSpace));
-    paint.addColorProcessor(yuvToRgbProcessor);
+    paint.addColorFragmentProcessor(yuvToRgbProcessor);
     SkRect r = SkRect::MakeWH(SkIntToScalar(yuvInfo.fSize[0].fWidth),
                               SkIntToScalar(yuvInfo.fSize[0].fHeight));
 
@@ -810,7 +810,7 @@
             if (colorFilter->asFragmentProcessors(context, grPaint->getProcessorDataManager(),
                                                   &array)) {
                 for (int i = 0; i < array.count(); ++i) {
-                    grPaint->addColorProcessor(array[i]);
+                    grPaint->addColorFragmentProcessor(array[i]);
                     array[i]->unref();
                 }
             }
@@ -820,7 +820,7 @@
 #ifndef SK_IGNORE_GPU_DITHER
     // If the dither flag is set, then we need to see if the underlying context
     // supports it. If not, then install a dither effect.
-    if (skPaint.isDither() && grPaint->numColorStages() > 0) {
+    if (skPaint.isDither() && grPaint->numColorFragmentProcessors() > 0) {
         // What are we rendering into?
         SkASSERT(rt);
 
@@ -832,7 +832,7 @@
             // not going to be dithered by the GPU.
             SkAutoTUnref<GrFragmentProcessor> fp(GrDitherEffect::Create());
             if (fp.get()) {
-                grPaint->addColorProcessor(fp);
+                grPaint->addColorFragmentProcessor(fp);
                 grPaint->setDither(false);
             }
         }
@@ -863,7 +863,7 @@
             return false;
         }
         if (fp) {
-            grPaint->addColorProcessor(fp)->unref();
+            grPaint->addColorFragmentProcessor(fp)->unref();
             constantColor = false;
         }
     }