| Index: include/effects/SkMergeImageFilter.h
|
| diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
|
| index 310c6cd3acb3ef8a5ab406120e5ed2eca5277dc2..2b7437edcd433eb12bea07819ee3f11f3a2d2e8e 100755
|
| --- a/include/effects/SkMergeImageFilter.h
|
| +++ b/include/effects/SkMergeImageFilter.h
|
| @@ -13,6 +13,8 @@
|
| #include "SkXfermode.h"
|
|
|
| class SK_API SkMergeImageFilter : public SkImageFilter {
|
| + typedef SkImageFilter INHERITED;
|
| +
|
| public:
|
| SkMergeImageFilter(SkImageFilter* first, SkImageFilter* second,
|
| SkXfermode::Mode = SkXfermode::kSrcOver_Mode,
|
| @@ -41,8 +43,6 @@ private:
|
|
|
| void initAllocModes();
|
| void initModes(const SkXfermode::Mode []);
|
| -
|
| - typedef SkImageFilter INHERITED;
|
| };
|
|
|
| #endif
|
|
|