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

Unified Diff: include/effects/SkMergeImageFilter.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/SkMatrixConvolutionImageFilter.h ('k') | include/effects/SkMorphologyImageFilter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/effects/SkMergeImageFilter.h
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
index 310c6cd3acb3ef8a5ab406120e5ed2eca5277dc2..2b7437edcd433eb12bea07819ee3f11f3a2d2e8e 100755
--- a/include/effects/SkMergeImageFilter.h
+++ b/include/effects/SkMergeImageFilter.h
@@ -13,6 +13,8 @@
#include "SkXfermode.h"
class SK_API SkMergeImageFilter : public SkImageFilter {
+ typedef SkImageFilter INHERITED;
+
public:
SkMergeImageFilter(SkImageFilter* first, SkImageFilter* second,
SkXfermode::Mode = SkXfermode::kSrcOver_Mode,
@@ -41,8 +43,6 @@ private:
void initAllocModes();
void initModes(const SkXfermode::Mode []);
-
- typedef SkImageFilter INHERITED;
};
#endif
« no previous file with comments | « include/effects/SkMatrixConvolutionImageFilter.h ('k') | include/effects/SkMorphologyImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698