| Index: src/effects/SkColorFilters.cpp
|
| diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
|
| index bd0d2aa6c89cfe96e5306302ac8af3b8b09da265..b7fa8eb5701b7aa949a60f73048856132040ab1f 100644
|
| --- a/src/effects/SkColorFilters.cpp
|
| +++ b/src/effects/SkColorFilters.cpp
|
| @@ -195,8 +195,6 @@ public:
|
| return SkNEW_ARGS(ModeColorFilterEffect, (c, mode));
|
| }
|
|
|
| - virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
|
| -
|
| bool willUseFilterColor() const {
|
| SkXfermode::Coeff dstCoeff;
|
| SkXfermode::Coeff srcCoeff;
|
| @@ -293,6 +291,9 @@ private:
|
| return fMode == s.fMode && fColor == s.fColor;
|
| }
|
|
|
| + virtual void onGetConstantColorComponents(GrColor* color, uint32_t* validFlags,
|
| + bool* isSingleComponent) const SK_OVERRIDE;
|
| +
|
| SkXfermode::Mode fMode;
|
| GrColor fColor;
|
|
|
| @@ -382,7 +383,8 @@ private:
|
|
|
| }
|
|
|
| -void ModeColorFilterEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| +void ModeColorFilterEffect::onGetConstantColorComponents(GrColor* color, uint32_t* validFlags,
|
| + bool* isSingleComponent) const {
|
| float inputColor[4];
|
| GrColorToRGBAFloat(*color, inputColor);
|
| float filterColor[4];
|
|
|