Revert of Rework GrPipelineInfo

src/effects/SkArithmeticMode_gpu.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 "SkArithmeticMode_gpu.h"
 
 #if SK_SUPPORT_GPU
@@ skipping 251 matching lines @@
 
 GrGLXferProcessor* ArithmeticXP::createGLInstance() const {
     return SkNEW_ARGS(GLArithmeticXP, (*this));
 }
 
 GrXferProcessor::OptFlags ArithmeticXP::onGetOptimizations(const GrProcOptInfo& colorPOI,
                                                            const GrProcOptInfo& coveragePOI,
                                                            bool doesStencilWrite,
                                                            GrColor* overrideColor,
                                                            const GrCaps& caps) {
-   return GrXferProcessor::kNone_OptFlags;
+   return GrXferProcessor::kNone_Opt;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrArithmeticXPFactory::GrArithmeticXPFactory(float k1, float k2, float k3, float k4,
                                              bool enforcePMColor) 
     : fK1(k1), fK2(k2), fK3(k3), fK4(k4), fEnforcePMColor(enforcePMColor) {
     this->initClassID<GrArithmeticXPFactory>();
 }
 
@@ skipping 27 matching lines @@
     float k1 = random->nextF();
     float k2 = random->nextF();
     float k3 = random->nextF();
     float k4 = random->nextF();
     bool enforcePMColor = random->nextBool();
 
     return GrArithmeticXPFactory::Create(k1, k2, k3, k4, enforcePMColor);
 }
 
 #endif