Revert of Add isSingleComponent bool to getConstantColorComponent

tests/GpuColorFilterTest.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.
  */
 
 #if SK_SUPPORT_GPU
 
@@ skipping 81 matching lines @@
         { kRGB , gr_whiteTrans, SkColorSetARGB(128, 200, 200, 200), SkXfermode::kDstOver_Mode, 0    , gr_black},
 
         // An unknown color with known alpha and red component filtered with Multiply produces an unknown color with known red and alpha.
         { kR|kA , gr_whiteTrans, SkColorSetARGB(128, 200, 200, 200), SkXfermode::kModulate_Mode, kR|kA, GrColorPackRGBA(50, 0, 0, 64) }
     };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(filterTests); ++i) {
         const GetConstantComponentTestCase& test = filterTests[i];
         SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(test.filterColor, test.filterMode));
         SkAutoTUnref<GrFragmentProcessor> effect(cf->asFragmentProcessor(grContext));
-        GrProcessor::InvariantOutput inout;
-        inout.fColor = test.inputColor;
-        inout.fValidFlags = test.inputComponents;
-        inout.fIsSingleComponent = false;
-        effect->computeInvariantOutput(&inout);
+        GrColor color = test.inputColor;
+        uint32_t components = test.inputComponents;
+        effect->getConstantColorComponents(&color, &components);
 
-        REPORTER_ASSERT(reporter, filterColor(inout.fColor, inout.fValidFlags) == test.outputColor);
-        REPORTER_ASSERT(reporter, test.outputComponents == inout.fValidFlags);
+        REPORTER_ASSERT(reporter, filterColor(color, components) == test.outputColor);
+        REPORTER_ASSERT(reporter, test.outputComponents == components);
     }
 }
 
 DEF_GPUTEST(GpuColorFilter, reporter, factory) {
     for (int type = 0; type < GrContextFactory::kLastGLContextType; ++type) {
         GrContextFactory::GLContextType glType = static_cast<GrContextFactory::GLContextType>(type);
 
         GrContext* grContext = factory->get(glType);
         if (NULL == grContext) {
             continue;
         }
 
         test_getConstantColorComponents(reporter, grContext);
     }
 }
 
 #endif