Revert of Another trivial cleanup

src/gpu/GrPipeline.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 "GrPipeline.h"
 
 #include "GrCaps.h"
@@ skipping 69 matching lines @@
     // GrPipelineBuilder's coverageProcInfo (like color above) to set this initial information.
     int firstCoverageStageIdx = 0;
 
     this->adjustProgramFromOptimizations(pipelineBuilder, optFlags, colorPOI, coveragePOI,
                                          &firstColorStageIdx, &firstCoverageStageIdx);
 
     bool usesLocalCoords = false;
 
     // Copy Stages from PipelineBuilder to Pipeline
     for (int i = firstColorStageIdx; i < pipelineBuilder.numColorFragmentStages(); ++i) {
-        const GrFragmentProcessor* fp = pipelineBuilder.fColorStages[i].processor();
-        SkNEW_APPEND_TO_TARRAY(&fFragmentStages, GrPendingFragmentStage, (fp));
-        usesLocalCoords = usesLocalCoords || fp->usesLocalCoords();
+        SkNEW_APPEND_TO_TARRAY(&fFragmentStages,
+                               GrPendingFragmentStage,
+                               (pipelineBuilder.fColorStages[i]));
+        usesLocalCoords = usesLocalCoords ||
+                          pipelineBuilder.fColorStages[i].processor()->usesLocalCoords();
     }
 
     fNumColorStages = fFragmentStages.count();
     for (int i = firstCoverageStageIdx; i < pipelineBuilder.numCoverageFragmentStages(); ++i) {
-        const GrFragmentProcessor* fp = pipelineBuilder.fCoverageStages[i].processor();
-        SkNEW_APPEND_TO_TARRAY(&fFragmentStages, GrPendingFragmentStage, (fp));
-        usesLocalCoords = usesLocalCoords || fp->usesLocalCoords();
+        SkNEW_APPEND_TO_TARRAY(&fFragmentStages,
+                               GrPendingFragmentStage,
+                               (pipelineBuilder.fCoverageStages[i]));
+        usesLocalCoords = usesLocalCoords ||
+                          pipelineBuilder.fCoverageStages[i].processor()->usesLocalCoords();
     }
 
     // Setup info we need to pass to GrPrimitiveProcessors that are used with this GrPipeline.
     fInfoForPrimitiveProcessor.fFlags = 0;
     if (!SkToBool(optFlags & GrXferProcessor::kIgnoreColor_OptFlag)) {
         fInfoForPrimitiveProcessor.fFlags |= GrPipelineInfo::kReadsColor_GrPipelineInfoFlag;
     }
     if (GrColor_ILLEGAL != overrideColor) {
         fInfoForPrimitiveProcessor.fFlags |= GrPipelineInfo::kUseOverrideColor_GrPipelineInfoFlag;
         fInfoForPrimitiveProcessor.fOverrideColor = overrideColor;
@@ skipping 57 matching lines @@
     SkASSERT(this->numFragmentStages() == that.numFragmentStages());
     for (int i = 0; i < this->numFragmentStages(); i++) {
 
         if (this->getFragmentStage(i) != that.getFragmentStage(i)) {
             return false;
         }
     }
     return true;
 }