Update XPF invariant info to not account for conflation

src/gpu/GrPaint.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrPaint.h"
 
@@ skipping 25 matching lines @@
                                        const GrTextureParams& params) {
     this->addColorProcessor(GrSimpleTextureEffect::Create(texture, matrix, params))->unref();
 }
 
 void GrPaint::addCoverageTextureProcessor(GrTexture* texture,
                                           const SkMatrix& matrix,
                                           const GrTextureParams& params) {
     this->addCoverageProcessor(GrSimpleTextureEffect::Create(texture, matrix, params))->unref();
 }
 
-bool GrPaint::isOpaqueAndConstantColor(GrColor* color) const {
+bool GrPaint::isConstantBlendedColor(GrColor* color) const {
     GrProcOptInfo coverageProcInfo;
     coverageProcInfo.calcWithInitialValues(fCoverageStages.begin(), this->numCoverageStages(),
                                            0xFFFFFFFF, kRGBA_GrColorComponentFlags, true);
     GrProcOptInfo colorProcInfo;
     colorProcInfo.calcWithInitialValues(fColorStages.begin(), this->numColorStages(), fColor,
                                         kRGBA_GrColorComponentFlags, false);
 
-    GrXPFactory::InvariantOutput output;
-    fXPFactory->getInvariantOutput(colorProcInfo, coverageProcInfo, &output);
+    GrXPFactory::InvariantBlendedColor blendedColor;
+    fXPFactory->getInvariantBlendedColor(colorProcInfo, coverageProcInfo, &blendedColor);
 
-    if (kRGBA_GrColorComponentFlags == output.fBlendedColorFlags &&
-        0xFF == GrColorUnpackA(output.fBlendedColor)) {
-        *color = output.fBlendedColor;
+    if (kRGBA_GrColorComponentFlags == blendedColor.fKnownColorFlags) {
+        *color = blendedColor.fKnownColor;
         return true;
     }
     return false;
 }