commit 4bf69f7bbc073c1dc257f93f8c5b2a530123cb3c
author rmistry <rmistry@google.com> Wed Aug 26 06:48:27 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Aug 26 06:48:27 2015 -0700
tree d6c670d7230600b174d6f08799a7ad1f4b9c002e
parent 8cce8f139e4b91783722f11ccb6ac9bbdf8327e7

Revert of Remove GrStagedProcessor, remove the word Stage as it applies to FPs (patchset #6 id:90001 of https://codereview.chromium.org/1307223004/ )

Reason for revert:
Causes bot failures:

https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Mac10.9-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug/builds/1639

https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/1702

https://uberchromegw.corp.google.com/i/client.skia.android/builders/Test-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Debug/builds/1223

Original issue's description:
> Remove GrStagedProcessor, remove the word Stage as it applies to FPs
>
> Committed: https://skia.googlesource.com/skia/+/24243446cdf7b7e4e132c2a0c387c7723777e0c7

TBR=joshualitt@google.com,egdaniel@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1306803003

src/gpu/GrProcessor.cpp

diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp
index 3cbf777..db1e2d9 100644
--- a/src/gpu/GrProcessor.cpp
+++ b/src/gpu/GrProcessor.cpp
@@ -130,12 +130,6 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-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() ||
@@ -167,7 +161,7 @@
     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;
 }
@@ -205,7 +199,7 @@
     }
 
     int index = fChildProcessors.count();
-    fChildProcessors.push_back(SkRef(child));
+    fChildProcessors.push_back(GrFragmentStage(child));
 
     if (child->willReadFragmentPosition()) {
         this->setWillReadFragmentPosition();