Revert of Add isSingleComponent bool to getConstantColorComponent

src/gpu/effects/GrSingleTextureEffect.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrSingleTextureEffect_DEFINED
 #define GrSingleTextureEffect_DEFINED
 
@@ skipping 26 matching lines @@
      * Helper for subclass onIsEqual() functions.
      */
     bool hasSameTextureParamsMatrixAndSourceCoords(const GrSingleTextureEffect& other) const {
         // We don't have to check the accesses' swizzles because they are inferred from the texture.
         return fTextureAccess == other.fTextureAccess &&
                fCoordTransform.getMatrix().cheapEqualTo(other.fCoordTransform.getMatrix()) &&
                fCoordTransform.sourceCoords() == other.fCoordTransform.sourceCoords();
     }
 
     /**
-     * Can be used as a helper to implement subclass onComputeInvariantOutput(). It assumes that
+     * Can be used as a helper to implement subclass getConstantColorComponents(). It assumes that
      * the subclass output color will be a modulation of the input color with a value read from the
      * texture.
      */
-    void updateInvariantOutputForModulation(InvariantOutput* inout) const {
-        if (inout->isOpaque() && GrPixelConfigIsOpaque(this->texture(0)->config())) {
-            inout->fValidFlags = kA_GrColorComponentFlag;
+    void updateConstantColorComponentsForModulation(GrColor* color, uint32_t* validFlags) const {
+        if ((*validFlags & kA_GrColorComponentFlag) && 0xFF == GrColorUnpackA(*color) &&
+            GrPixelConfigIsOpaque(this->texture(0)->config())) {
+            *validFlags = kA_GrColorComponentFlag;
         } else {
-            inout->fValidFlags = 0;
+            *validFlags = 0;
         }
     }
 
 private:
     GrCoordTransform fCoordTransform;
     GrTextureAccess  fTextureAccess;
 
     typedef GrFragmentProcessor INHERITED;
 };
 
 #endif