Chromium Code Reviews| Index: include/effects/SkArithmeticMode.h |
| diff --git a/include/effects/SkArithmeticMode.h b/include/effects/SkArithmeticMode.h |
| index 9de332caef4016e414165549ae07b8eca8de6289..8e5d79a9b274b756d13e60ee3fef4f6585468def 100644 |
| --- a/include/effects/SkArithmeticMode.h |
| +++ b/include/effects/SkArithmeticMode.h |
| @@ -8,9 +8,12 @@ |
| #ifndef SkArithmeticMode_DEFINED |
| #define SkArithmeticMode_DEFINED |
| -#include "SkXfermode.h" |
| +#include "SkFlattenable.h" |
| +#include "SkScalar.h" |
| -class SK_API SkArithmeticMode : public SkXfermode { |
| +class SkXfermode; |
| + |
| +class SK_API SkArithmeticMode { |
| public: |
| /** |
| * result = clamp[k1 * src * dst + k2 * src + k3 * dst + k4] |
| @@ -25,10 +28,10 @@ public: |
| static SkXfermode* Create(SkScalar k1, SkScalar k2, |
| SkScalar k3, SkScalar k4); |
| - SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP(); |
| + SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() |
|
sugoi1
2013/10/09 14:29:58
I added the missing semicolon to remove this line
|
| private: |
| - typedef SkXfermode INHERITED; |
| + SkArithmeticMode(); // can't be instantiated |
| }; |
| #endif |