Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Unified Diff: include/effects/SkDisplacementMapEffect.h

Issue 25430005: Fix for potential typedef issue Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/effects/SkDiscretePathEffect.h ('k') | include/effects/SkDropShadowImageFilter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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); }
};
« no previous file with comments | « include/effects/SkDiscretePathEffect.h ('k') | include/effects/SkDropShadowImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698