Revert of Another trivial cleanup

src/gpu/GrProcOptInfo.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrProcOptInfo.h"
 
 #include "GrBatch.h"
+#include "GrFragmentProcessor.h"
+#include "GrFragmentStage.h"
 #include "GrGeometryProcessor.h"
 
 void GrProcOptInfo::calcColorWithBatch(const GrBatch* batch,
                                        const GrFragmentStage* stages,
                                        int stageCount) {
     GrInitInvariantOutput out;
     batch->getInvariantOutputColor(&out);
     fInOut.reset(out);
     this->internalCalc(stages, stageCount, batch->willReadFragmentPosition());
 }
@@ skipping 65 matching lines @@
             fInputColor = fInOut.color();
             fInputColorIsUsed = true;
             // Since we are clearing all previous color stages we are in a state where we have found
             // zero stages that don't multiply the inputColor.
             fInOut.resetNonMulStageFound();
             // Reset these since we don't care if previous stages read these values
             fReadsFragPosition = initWillReadFragmentPosition;
         }
     }
 }