change colorfilter to return an array of frag processors

src/core/SkColorFilter.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorFilter.h"
 #include "SkReadBuffer.h"
 #include "SkString.h"
@@ skipping 19 matching lines @@
         memcpy(d, s, count * sizeof(uint16_t));
     }
 }
 
 SkColor SkColorFilter::filterColor(SkColor c) const {
     SkPMColor dst, src = SkPreMultiplyColor(c);
     this->filterSpan(&src, 1, &dst);
     return SkUnPreMultiply::PMColorToColor(dst);
 }
 
-GrFragmentProcessor* SkColorFilter::asFragmentProcessor(GrContext*) const {
-    return NULL;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 class SkComposeColorFilter : public SkColorFilter {
 public:
     SkComposeColorFilter(SkColorFilter* outer, SkColorFilter* inner)
         : fOuter(SkRef(outer))
         , fInner(SkRef(inner))
     {}
     
     uint32_t getFlags() const SK_OVERRIDE {
@@ skipping 14 matching lines @@
     
 #ifndef SK_IGNORE_TO_STRING
     void toString(SkString* str) const SK_OVERRIDE {
         SkString outerS, innerS;
         fOuter->toString(&outerS);
         fInner->toString(&innerS);
         str->appendf("SkComposeColorFilter: outer(%s) inner(%s)", outerS.c_str(), innerS.c_str());
     }
 #endif
 
-#if 0   // TODO: should we support composing the fragments?
 #if SK_SUPPORT_GPU
-    GrFragmentProcessor* asFragmentProcessor(GrContext*) const SK_OVERRIDE;
-#endif
+    bool asFragmentProcessors(GrContext* context,
+                              SkTDArray<GrFragmentProcessor*>* array) const SK_OVERRIDE {
+        bool hasFrags = fInner->asFragmentProcessors(context, array);
+        hasFrags |= fOuter->asFragmentProcessors(context, array);
+        return hasFrags;
+    }
 #endif
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeColorFilter)
     
 protected:
     void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
         buffer.writeFlattenable(fOuter);
         buffer.writeFlattenable(fInner);
     }
     
@@ skipping 27 matching lines @@
     if (NULL == composition) {
         composition = SkNEW_ARGS(SkComposeColorFilter, (outer, inner));
     }
     return composition;
 }
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter)
 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeColorFilter)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END