This renames methods and classes that relate to static analysis of combinations of GrDrawOps and GrPipelines.

Change-Id: I737b901a19d3c67d2ff7f95802fb4df35656beb2
Reviewed-on: https://skia-review.googlesource.com/6199
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp
index 5d7c0e1cc8..5e1089cc05 100644
--- a/src/gpu/GrPathProcessor.cpp
+++ b/src/gpu/GrPathProcessor.cpp
@@ -20,8 +20,8 @@ public:
     static void GenKey(const GrPathProcessor& pathProc,
                        const GrShaderCaps&,
                        GrProcessorKeyBuilder* b) {
-        b->add32(SkToInt(pathProc.overrides().readsColor()) |
-                 (SkToInt(pathProc.overrides().readsCoverage()) << 1) |
+        b->add32(SkToInt(pathProc.optimizations().readsColor()) |
+                 (SkToInt(pathProc.optimizations().readsCoverage()) << 1) |
                  (SkToInt(pathProc.viewMatrix().hasPerspective()) << 2));
     }
 
@@ -37,7 +37,7 @@ public:
         this->emitTransforms(args.fVaryingHandler, args.fFPCoordTransformHandler);
 
         // Setup uniform color
-        if (pathProc.overrides().readsColor()) {
+        if (pathProc.optimizations().readsColor()) {
             const char* stagedLocalVarName;
             fColorUniform = args.fUniformHandler->addUniform(kFragment_GrShaderFlag,
                                                              kVec4f_GrSLType,
@@ -48,7 +48,7 @@ public:
         }
 
         // setup constant solid coverage
-        if (pathProc.overrides().readsCoverage()) {
+        if (pathProc.optimizations().readsCoverage()) {
             fragBuilder->codeAppendf("%s = vec4(1);", args.fOutputCoverage);
         }
     }
@@ -79,7 +79,7 @@ public:
                  const GrPrimitiveProcessor& primProc,
                  FPCoordTransformIter&& transformIter) override {
         const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>();
-        if (pathProc.overrides().readsColor() && pathProc.color() != fColor) {
+        if (pathProc.optimizations().readsColor() && pathProc.color() != fColor) {
             float c[4];
             GrColorToRGBAFloat(pathProc.color(), c);
             pd.set4fv(fColorUniform, 1, c);
@@ -120,13 +120,13 @@ private:
 };
 
 GrPathProcessor::GrPathProcessor(GrColor color,
-                                 const GrXPOverridesForBatch& overrides,
+                                 const GrPipelineOptimizations& optimizations,
                                  const SkMatrix& viewMatrix,
                                  const SkMatrix& localMatrix)
-    : fColor(color)
-    , fViewMatrix(viewMatrix)
-    , fLocalMatrix(localMatrix)
-    , fOverrides(overrides) {
+        : fColor(color)
+        , fViewMatrix(viewMatrix)
+        , fLocalMatrix(localMatrix)
+        , fOptimizations(optimizations) {
     this->initClassID<GrPathProcessor>();
 }