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

Unified Diff: include/effects/Sk1DPathEffect.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/core/SkXfermode.h ('k') | include/effects/Sk2DPathEffect.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/effects/Sk1DPathEffect.h
diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h
index 4599276e7bba47267baba558e824bd1ac4878cb6..fc7dc77139bcc2b4d06915e7ba11389a7aad414d 100644
--- a/include/effects/Sk1DPathEffect.h
+++ b/include/effects/Sk1DPathEffect.h
@@ -15,6 +15,8 @@ class SkPathMeasure;
// This class is not exported to java.
class SK_API Sk1DPathEffect : public SkPathEffect {
+ typedef SkPathEffect INHERITED;
+
public:
virtual bool filterPath(SkPath* dst, const SkPath& src,
SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
@@ -30,12 +32,11 @@ protected:
contour is done.
*/
virtual SkScalar next(SkPath* dst, SkScalar dist, SkPathMeasure&) const = 0;
-
-private:
- typedef SkPathEffect INHERITED;
};
class SK_API SkPath1DPathEffect : public Sk1DPathEffect {
+ typedef Sk1DPathEffect INHERITED;
+
public:
enum Style {
kTranslate_Style, // translate the shape to each position
@@ -72,8 +73,6 @@ private:
SkScalar fAdvance; // copied from constructor
SkScalar fInitialOffset; // computed from phase
Style fStyle; // copied from constructor
-
- typedef Sk1DPathEffect INHERITED;
};
#endif
« no previous file with comments | « include/core/SkXfermode.h ('k') | include/effects/Sk2DPathEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698