| Index: src/core/SkColorFilter.cpp
|
| diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
|
| index 2a78058106a01b2266190b0a7ccbc5b21fa6b377..fd76dd1c9be033912a2cae899079fff73ccc2f7b 100644
|
| --- a/src/core/SkColorFilter.cpp
|
| +++ b/src/core/SkColorFilter.cpp
|
| @@ -37,10 +37,6 @@ SkColor SkColorFilter::filterColor(SkColor c) const {
|
| return SkUnPreMultiply::PMColorToColor(dst);
|
| }
|
|
|
| -GrFragmentProcessor* SkColorFilter::asFragmentProcessor(GrContext*) const {
|
| - return NULL;
|
| -}
|
| -
|
| ///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
| class SkComposeColorFilter : public SkColorFilter {
|
| @@ -75,10 +71,13 @@ public:
|
| }
|
| #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)
|
|
|