Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: src/gpu/SkGr.cpp

Issue 973593002: change colorfilter to return an array of frag processors (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update gm Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/gpu/SkGr.cpp
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 401a50eca8b53145b17734b652271ce993a1707e..ff6f7fa098ed47cd254d82b9f1edafed023e3655 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -662,9 +662,12 @@ void SkPaint2GrPaintNoShader(GrContext* context, GrRenderTarget* rt, const SkPai
SkColor filtered = colorFilter->filterColor(skPaint.getColor());
grPaint->setColor(SkColor2GrColor(filtered));
} else {
- SkAutoTUnref<GrFragmentProcessor> fp(colorFilter->asFragmentProcessor(context));
- if (fp.get()) {
- grPaint->addColorProcessor(fp);
+ SkTDArray<GrFragmentProcessor*> array;
+ if (colorFilter->asFragmentProcessors(context, &array)) {
+ for (int i = 0; i < array.count(); ++i) {
+ grPaint->addColorProcessor(array[i]);
+ array[i]->unref();
+ }
}
}
}

Powered by Google App Engine
This is Rietveld 408576698