Revert of Rework GrPipelineInfo

src/gpu/effects/GrCustomXfermode.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "effects/GrCustomXfermode.h"
 #include "effects/GrCustomXfermodePriv.h"
 
@@ skipping 734 matching lines @@
 
 
       f * blend(Sa, Da) + (1-f) * Da
         = f * (Sa + Da - Sa * Da) + (1-f) * Da
         = f*Sa + f*Da - f*Sa * Da + Da - f*Da
         = f*Sa - f*Sa * Da + Da
         = f*Sa + Da - f*Sa * Da
         = blend(f*Sa, Da)
    */
 
-    OptFlags flags = kNone_OptFlags;
+    OptFlags flags = kNone_Opt;
     if (colorPOI.allStagesMultiplyInput()) {
         flags |= kCanTweakAlphaForCoverage_OptFlag;
     }
     if (this->hasHWBlendEquation() && coveragePOI.isSolidWhite()) {
         flags |= kIgnoreCoverage_OptFlag;
     }
     return flags;
 }
 
 bool CustomXP::onWillNeedXferBarrier(const GrRenderTarget* rt,
@@ skipping 50 matching lines @@
 GR_DEFINE_XP_FACTORY_TEST(GrCustomXPFactory);
 GrXPFactory* GrCustomXPFactory::TestCreate(SkRandom* rand,
                                            GrContext*,
                                            const GrCaps&,
                                            GrTexture*[]) {
     int mode = rand->nextRangeU(SkXfermode::kLastCoeffMode + 1, SkXfermode::kLastSeparableMode);
 
     return SkNEW_ARGS(GrCustomXPFactory, (static_cast<SkXfermode::Mode>(mode)));
 }