| Index: src/effects/SkToFromValue.cpp
|
| diff --git a/src/effects/SkToFromValue.cpp b/src/effects/SkToFromValue.cpp
|
| index cbb265b33fa244530ad8a9fa18ebbb8ab7f1e62b..9bc46019877e6df00ac940c44cc0ca817a940b48 100644
|
| --- a/src/effects/SkToFromValue.cpp
|
| +++ b/src/effects/SkToFromValue.cpp
|
| @@ -88,6 +88,8 @@ static bool from_value_ArithmeticXfermode(const SkValue& val,
|
| return true;
|
| }
|
|
|
| +#if SK_INCLUDE_DEPRECATED_XFERMODES
|
| +
|
| static bool from_value_PixelXorXfermode(const SkValue& val,
|
| SkAutoTUnref<SkXfermode>* dst) {
|
| uint32_t opColor;
|
| @@ -96,6 +98,8 @@ static bool from_value_PixelXorXfermode(const SkValue& val,
|
| return true;
|
| }
|
|
|
| +#endif
|
| +
|
| static bool from_value_ProcCoeffXfermode(const SkValue& val,
|
| SkAutoTUnref<SkXfermode>* dst) {
|
| uint32_t mode;
|
| @@ -109,7 +113,9 @@ template<> bool SkFromValue< SkAutoTUnref<SkXfermode> >(
|
| switch (val.type()) {
|
| case SkValue::DefaultXfermode: return from_value_DefaultXfermode(val, dst);
|
| case SkValue::ArithmeticXfermode: return from_value_ArithmeticXfermode(val, dst);
|
| +#if SK_INCLUDE_DEPRECATED_XFERMODES
|
| case SkValue::PixelXorXfermode: return from_value_PixelXorXfermode(val, dst);
|
| +#endif
|
| case SkValue::ProcCoeffXfermode: return from_value_ProcCoeffXfermode(val, dst);
|
| default: REQUIRE(false);
|
| }
|
|
|