commit d07a2793baea42956d27b3ad47ed562f08e4570a
author bsalomon <bsalomon@google.com> Wed Jul 08 10:20:21 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jul 08 10:20:21 2015 -0700
tree 43f0a8ac998e1fc05b7063e65c3f69317f209e68
parent 60c047557559e5410063452e59d65377e813e5f2

Revert of Rework GrPipelineInfo (patchset #7 id:120001 of https://codereview.chromium.org/1213383005/)

Reason for revert:
breaking stuff!

Original issue's description:
> Makes GrPipelineInfo a class with query functions used by GrBatch subclasses.
>
> Committed: https://skia.googlesource.com/skia/+/f5179a4c490bc787190321bd8ffdb0e6a4efa9ac

TBR=joshualitt@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

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

src/gpu/GrPathProcessor.cpp

diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp
index d10c466..b47fa6a 100644
--- a/src/gpu/GrPathProcessor.cpp
+++ b/src/gpu/GrPathProcessor.cpp
@@ -32,18 +32,17 @@
 
 void GrPathProcessor::initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const {
     PathBatchTracker* local = bt->cast<PathBatchTracker>();
-    if (!init.readsColor()) {
+    if (init.fColorIgnored) {
         local->fInputColorType = kIgnored_GrGPInput;
         local->fColor = GrColor_ILLEGAL;
     } else {
         local->fInputColorType = kUniform_GrGPInput;
-        if (!init.getOverrideColorIfSet(&local->fColor)) {
-            local->fColor = this->color();
-        }
+        local->fColor = GrColor_ILLEGAL == init.fOverrideColor ? this->color() :
+                                                                 init.fOverrideColor;
     }
 
-    local->fInputCoverageType = init.readsCoverage() ? kAllOnes_GrGPInput : kIgnored_GrGPInput;
-    local->fUsesLocalCoords = init.readsLocalCoords();
+    local->fInputCoverageType = init.fCoverageIgnored ? kIgnored_GrGPInput : kAllOnes_GrGPInput;
+    local->fUsesLocalCoords = init.fUsesLocalCoords;
 }
 
 bool GrPathProcessor::canMakeEqual(const GrBatchTracker& m,