| Index: include/effects/SkAvoidXfermode.h | 
| diff --git a/include/effects/SkAvoidXfermode.h b/include/effects/SkAvoidXfermode.h | 
| index 4950b64707133930f7f956f08faa7cb1d938465e..1874767c16369beb1592aa9c987e0184fc2cdc9c 100644 | 
| --- a/include/effects/SkAvoidXfermode.h | 
| +++ b/include/effects/SkAvoidXfermode.h | 
| @@ -16,6 +16,8 @@ | 
| color. | 
| */ | 
| class SK_API SkAvoidXfermode : public SkXfermode { | 
| +    typedef SkXfermode INHERITED; | 
| + | 
| public: | 
| enum Mode { | 
| kAvoidColor_Mode,   //!< draw everywhere except on the opColor | 
| @@ -58,8 +60,6 @@ private: | 
| SkColor     fOpColor; | 
| uint32_t    fDistMul;   // x.14 | 
| Mode        fMode; | 
| - | 
| -    typedef SkXfermode INHERITED; | 
| }; | 
|  | 
| #endif | 
|  |