Update XPF invariant info to not account for conflation

src/gpu/GrProcOptInfo.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrProcOptInfo_DEFINED
 #define GrProcOptInfo_DEFINED
 
@@ skipping 36 matching lines @@
     bool isSingleComponent() const { return fInOut.isSingleComponent(); }
     bool allStagesMultiplyInput() const { return fInOut.allStagesMulInput(); }
 
     // TODO: Once texture pixel configs quaries are updated, we no longer need this function.
     // For now this function will correctly tell us if we are using LCD text or not and should only
     // be called when looking at the coverage output.
     bool isFourChannelOutput() const { return !fInOut.isSingleComponent() &&
                                                fInOut.isLCDCoverage(); }
 
     GrColor color() const { return fInOut.color(); }
-    uint8_t validFlags() const { return fInOut.validFlags(); }
+
+    GrColorComponentFlags validFlags() const {
+        return static_cast<GrColorComponentFlags>(fInOut.validFlags());
+    }
 
     /**
      * Returns the index of the first effective color stage. If an intermediate stage doesn't read
      * its input or has a known output, then we can ignore all earlier stages since they will not
      * affect the final output. Thus the first effective stage index is the index to the first stage
      * that will have an effect on the final output.
      *
      * If stages before the firstEffectiveStageIndex are removed, corresponding values from
      * inputColorIsUsed(), inputColorToEffectiveStage(), removeVertexAttribs(), and readsDst() must
      * be used when setting up the draw to ensure correct drawing.
@@ skipping 20 matching lines @@
     void internalCalc(const GrFragmentStage*, int stagecount, bool initWillReadFragPosition);
 
     GrInvariantOutput fInOut;
     int fFirstEffectStageIndex;
     bool fInputColorIsUsed;
     GrColor fInputColor;
     bool fReadsFragPosition;
 };
 
 #endif