| Index: include/effects/SkDisplacementMapEffect.h
|
| diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h
|
| index ed9d15b15a226fa59fe276c362b3cebcfaa680a5..7a377de4075f50bf8039e3733eee49bb5638aa99 100644
|
| --- a/include/effects/SkDisplacementMapEffect.h
|
| +++ b/include/effects/SkDisplacementMapEffect.h
|
| @@ -12,6 +12,8 @@
|
| #include "SkBitmap.h"
|
|
|
| class SK_API SkDisplacementMapEffect : public SkImageFilter {
|
| + typedef SkImageFilter INHERITED;
|
| +
|
| public:
|
| enum ChannelSelectorType {
|
| kUnknown_ChannelSelectorType,
|
| @@ -50,7 +52,6 @@ private:
|
| ChannelSelectorType fXChannelSelector;
|
| ChannelSelectorType fYChannelSelector;
|
| SkScalar fScale;
|
| - typedef SkImageFilter INHERITED;
|
| SkImageFilter* getDisplacementInput() { return getInput(0); }
|
| SkImageFilter* getColorInput() { return getInput(1); }
|
| };
|
|
|