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

Unified Diff: include/effects/SkMorphologyImageFilter.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/SkMergeImageFilter.h ('k') | include/effects/SkPerlinNoiseShader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/effects/SkMorphologyImageFilter.h
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
index d63f49dab9c8cd2560bed53d3bb100ba4abda1c6..3134056c4acbecfee35b111a28ac340686261c56 100644
--- a/include/effects/SkMorphologyImageFilter.h
+++ b/include/effects/SkMorphologyImageFilter.h
@@ -13,6 +13,8 @@
#include "SkSize.h"
class SK_API SkMorphologyImageFilter : public SkImageFilter {
+ typedef SkImageFilter INHERITED;
+
public:
SkMorphologyImageFilter(int radiusX, int radiusY, SkImageFilter* input, const SkIRect* cropRect);
@@ -27,10 +29,11 @@ protected:
private:
SkISize fRadius;
- typedef SkImageFilter INHERITED;
};
class SK_API SkDilateImageFilter : public SkMorphologyImageFilter {
+ typedef SkMorphologyImageFilter INHERITED;
+
public:
SkDilateImageFilter(int radiusX, int radiusY,
SkImageFilter* input = NULL,
@@ -48,12 +51,11 @@ public:
protected:
SkDilateImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
-
-private:
- typedef SkMorphologyImageFilter INHERITED;
};
class SK_API SkErodeImageFilter : public SkMorphologyImageFilter {
+ typedef SkMorphologyImageFilter INHERITED;
+
public:
SkErodeImageFilter(int radiusX, int radiusY,
SkImageFilter* input = NULL,
@@ -71,9 +73,6 @@ public:
protected:
SkErodeImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
-
-private:
- typedef SkMorphologyImageFilter INHERITED;
};
#endif
« no previous file with comments | « include/effects/SkMergeImageFilter.h ('k') | include/effects/SkPerlinNoiseShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698