Revert of Remove GrStagedProcessor, remove the word Stage as it applies to FPs

src/gpu/GrProcessor.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrProcessor.h"
 #include "GrContext.h"
 #include "GrCoordTransform.h"
@@ skipping 112 matching lines @@
     for (int i = 0; i < this->numTextures(); ++i) {
         if (this->textureAccess(i) != that.textureAccess(i)) {
             return false;
         }
     }
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-GrFragmentProcessor::~GrFragmentProcessor() {
-    for (int i = 0; i < fChildProcessors.count(); ++i) {
-        fChildProcessors[i]->unref();
-    }
-}
-
 bool GrFragmentProcessor::isEqual(const GrFragmentProcessor& that,
                                   bool ignoreCoordTransforms) const {
     if (this->classID() != that.classID() ||
         !this->hasSameTextureAccesses(that)) {
         return false;
     }
     if (ignoreCoordTransforms) {
         if (this->numTransforms() != that.numTransforms()) {
             return false;
         }
@@ skipping 11 matching lines @@
             return false;
         }
     }
     return true;
 }
 
 GrGLFragmentProcessor* GrFragmentProcessor::createGLInstance() const {
     GrGLFragmentProcessor* glFragProc = this->onCreateGLInstance();
     glFragProc->fChildProcessors.push_back_n(fChildProcessors.count());
     for (int i = 0; i < fChildProcessors.count(); ++i) {
-        glFragProc->fChildProcessors[i] = fChildProcessors[i]->createGLInstance();
+        glFragProc->fChildProcessors[i] = fChildProcessors[i].processor()->createGLInstance();
     }
     return glFragProc;
 }
 
 void GrFragmentProcessor::addTextureAccess(const GrTextureAccess* textureAccess) {
     // Can't add texture accesses after registering any children since their texture accesses have
     // already been bubbled up into our fTextureAccesses array
     SkASSERT(fChildProcessors.empty());
 
     INHERITED::addTextureAccess(textureAccess);
@@ skipping 17 matching lines @@
     if (!child->fCoordTransforms.empty()) {
         fCoordTransforms.push_back_n(child->fCoordTransforms.count(),
                                      child->fCoordTransforms.begin());
     }
     if (!child->fTextureAccesses.empty()) {
         fTextureAccesses.push_back_n(child->fTextureAccesses.count(),
                                      child->fTextureAccesses.begin());
     }
 
     int index = fChildProcessors.count();
-    fChildProcessors.push_back(SkRef(child));
+    fChildProcessors.push_back(GrFragmentStage(child));
 
     if (child->willReadFragmentPosition()) {
         this->setWillReadFragmentPosition();
     }
 
     if (child->usesLocalCoords()) {
         fUsesLocalCoords = true;
     }
 
     return index;
@@ skipping 25 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // GrProcessorDataManager lives in the same pool
 void* GrProcessorDataManager::operator new(size_t size) {
     return MemoryPoolAccessor().pool()->allocate(size);
 }
 
 void GrProcessorDataManager::operator delete(void* target) {
     return MemoryPoolAccessor().pool()->release(target);
 }