| Index: src/gpu/GrProcessor.cpp
|
| diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp
|
| index 3cbf777253ddf4f2d543338f330647ddaedb4353..db1e2d9f6198a0103c08728a8326b6dbf9ef5df3 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();
|
|
|