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

Unified Diff: include/effects/SkKernel33MaskFilter.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/SkEmbossMaskFilter.h ('k') | include/effects/SkLayerDrawLooper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/effects/SkKernel33MaskFilter.h
diff --git a/include/effects/SkKernel33MaskFilter.h b/include/effects/SkKernel33MaskFilter.h
index 3404b73b1773a71350892c4e40897de3483f402f..1851adb293065aa69f50dfe221725881e098df94 100644
--- a/include/effects/SkKernel33MaskFilter.h
+++ b/include/effects/SkKernel33MaskFilter.h
@@ -11,6 +11,8 @@
#include "SkMaskFilter.h"
class SK_API SkKernel33ProcMaskFilter : public SkMaskFilter {
+ typedef SkMaskFilter INHERITED;
+
public:
SkKernel33ProcMaskFilter(unsigned percent256 = 256)
: fPercent256(percent256) {}
@@ -29,13 +31,13 @@ protected:
private:
int fPercent256;
-
- typedef SkMaskFilter INHERITED;
};
///////////////////////////////////////////////////////////////////////////////
class SK_API SkKernel33MaskFilter : public SkKernel33ProcMaskFilter {
+ typedef SkKernel33ProcMaskFilter INHERITED;
+
public:
SkKernel33MaskFilter(const int coeff[3][3], int shift, int percent256 = 256)
: SkKernel33ProcMaskFilter(percent256) {
@@ -55,8 +57,6 @@ private:
SkKernel33MaskFilter(SkFlattenableReadBuffer& rb);
virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
-
- typedef SkKernel33ProcMaskFilter INHERITED;
};
#endif
« no previous file with comments | « include/effects/SkEmbossMaskFilter.h ('k') | include/effects/SkLayerDrawLooper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698