commit e25eea4b36a488448fb730f4e3dc5a900b0e2892
author bsalomon <bsalomon@google.com> Tue Sep 29 06:38:55 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Sep 29 06:38:55 2015 -0700
tree 6d4dbf179e793c456c2c164a6822528a13cba715
parent c56c6ef3ce6447f39894649d535acb1606595d31

Use child processors to implement compose color filter.

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

src/effects/SkColorFilters.cpp

diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
index 0c6a612..da01893 100644
--- a/src/effects/SkColorFilters.cpp
+++ b/src/effects/SkColorFilters.cpp
@@ -70,36 +70,32 @@
 #include "effects/GrConstColorProcessor.h"
 #include "SkGr.h"
 
-bool SkModeColorFilter::asFragmentProcessors(GrContext*, GrProcessorDataManager*,
-                                             SkTDArray<const GrFragmentProcessor*>* array) const {
-    if (SkXfermode::kDst_Mode != fMode) {
-        SkAutoTUnref<const GrFragmentProcessor> constFP(
-            GrConstColorProcessor::Create(SkColorToPremulGrColor(fColor),
-                                          GrConstColorProcessor::kIgnore_InputMode));
-        const GrFragmentProcessor* fp =
-            GrXfermodeFragmentProcessor::CreateFromSrcProcessor(constFP, fMode);
-        if (fp) {
-#ifdef SK_DEBUG
-            // With a solid color input this should always be able to compute the blended color
-            // (at least for coeff modes)
-            if (fMode <= SkXfermode::kLastCoeffMode) {
-                static SkRandom gRand;
-                GrInvariantOutput io(GrPremulColor(gRand.nextU()), kRGBA_GrColorComponentFlags,
-                                     false);
-                fp->computeInvariantOutput(&io);
-                SkASSERT(io.validFlags() == kRGBA_GrColorComponentFlags);
-            }
-#endif
-            if (array) {
-                *array->append() = fp;
-            } else {
-                fp->unref();
-                SkDEBUGCODE(fp = nullptr;)
-            }
-            return true;
-        }
+const GrFragmentProcessor* SkModeColorFilter::asFragmentProcessor(GrContext*,
+                                                                  GrProcessorDataManager*) const {
+    if (SkXfermode::kDst_Mode == fMode) {
+        return nullptr;
     }
-    return false;
+
+    SkAutoTUnref<const GrFragmentProcessor> constFP(
+        GrConstColorProcessor::Create(SkColorToPremulGrColor(fColor),
+                                        GrConstColorProcessor::kIgnore_InputMode));
+    const GrFragmentProcessor* fp =
+        GrXfermodeFragmentProcessor::CreateFromSrcProcessor(constFP, fMode);
+    if (!fp) {
+        return nullptr;
+    }
+#ifdef SK_DEBUG
+    // With a solid color input this should always be able to compute the blended color
+    // (at least for coeff modes)
+    if (fMode <= SkXfermode::kLastCoeffMode) {
+        static SkRandom gRand;
+        GrInvariantOutput io(GrPremulColor(gRand.nextU()), kRGBA_GrColorComponentFlags,
+                                false);
+        fp->computeInvariantOutput(&io);
+        SkASSERT(io.validFlags() == kRGBA_GrColorComponentFlags);
+    }
+#endif
+    return fp;
 }
 
 #endif