commit ac856c97acc84dcb54d9cdb068ec8a02b8869647
author bsalomon <bsalomon@google.com> Thu Aug 27 06:30:17 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 27 06:30:17 2015 -0700
tree 6ae028321a4e2f179918390a03788f3e598545e5
parent a04c650459280363454da3b43ae910b8593434c8

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

Committed: https://skia.googlesource.com/skia/+/24243446cdf7b7e4e132c2a0c387c7723777e0c7

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

src/gpu/GrProcessor.cpp

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