Fix for potential typedef issue

src/effects/SkColorFilters.cpp

Index: src/effects/SkColorFilters.cpp
diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
index 41a201ef39559fc232e10319c3a9e65f20c39c8c..fd442906bf5f6553b4a9cb856df7b0925ad09aa6 100644
--- a/src/effects/SkColorFilters.cpp
+++ b/src/effects/SkColorFilters.cpp
@@ -18,6 +18,8 @@
 
 // baseclass for filters that store a color and mode
 class SkModeColorFilter : public SkColorFilter {
+    typedef SkColorFilter INHERITED;
+
 public:
     SkModeColorFilter(SkColor color) {
         fColor = color;
@@ -113,11 +115,11 @@ private:
         fProc = SkXfermode::GetProc(fMode);
         fProc16 = SkXfermode::GetProc16(fMode, fColor);
     }
-
-    typedef SkColorFilter INHERITED;
 };
 
 class Src_SkModeColorFilter : public SkModeColorFilter {
+    typedef SkModeColorFilter INHERITED;
+
 public:
     Src_SkModeColorFilter(SkColor color) : INHERITED(color, SkXfermode::kSrc_Mode) {}
 
@@ -145,12 +147,11 @@ public:
 protected:
     Src_SkModeColorFilter(SkFlattenableReadBuffer& buffer)
         : INHERITED(buffer) {}
-
-private:
-    typedef SkModeColorFilter INHERITED;
 };
 
 class SrcOver_SkModeColorFilter : public SkModeColorFilter {
+    typedef SkModeColorFilter INHERITED;
+
 public:
     SrcOver_SkModeColorFilter(SkColor color)
             : INHERITED(color, SkXfermode::kSrcOver_Mode) {
@@ -187,8 +188,6 @@ protected:
 private:
 
     SkBlitRow::ColorProc fColor32Proc;
-
-    typedef SkModeColorFilter INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -243,6 +242,8 @@ static inline unsigned pin(unsigned value, unsigned max) {
 }
 
 class SkLightingColorFilter : public SkColorFilter {
+    typedef SkColorFilter INHERITED;
+
 public:
     SkLightingColorFilter(SkColor mul, SkColor add) : fMul(mul), fAdd(add) {}
 
@@ -294,12 +295,11 @@ protected:
     }
 
     SkColor fMul, fAdd;
-
-private:
-    typedef SkColorFilter INHERITED;
 };
 
 class SkLightingColorFilter_JustAdd : public SkLightingColorFilter {
+    typedef SkLightingColorFilter INHERITED;
+
 public:
     SkLightingColorFilter_JustAdd(SkColor mul, SkColor add)
         : INHERITED(mul, add) {}
@@ -336,12 +336,11 @@ public:
 protected:
     SkLightingColorFilter_JustAdd(SkFlattenableReadBuffer& buffer)
         : INHERITED(buffer) {}
-
-private:
-    typedef SkLightingColorFilter INHERITED;
 };
 
 class SkLightingColorFilter_JustMul : public SkLightingColorFilter {
+    typedef SkLightingColorFilter INHERITED;
+
 public:
     SkLightingColorFilter_JustMul(SkColor mul, SkColor add)
         : INHERITED(mul, add) {}
@@ -377,12 +376,11 @@ public:
 protected:
     SkLightingColorFilter_JustMul(SkFlattenableReadBuffer& buffer)
         : INHERITED(buffer) {}
-
-private:
-    typedef SkLightingColorFilter INHERITED;
 };
 
 class SkLightingColorFilter_SingleMul : public SkLightingColorFilter {
+    typedef SkLightingColorFilter INHERITED;
+
 public:
     SkLightingColorFilter_SingleMul(SkColor mul, SkColor add)
             : INHERITED(mul, add) {
@@ -421,12 +419,11 @@ public:
 protected:
     SkLightingColorFilter_SingleMul(SkFlattenableReadBuffer& buffer)
         : INHERITED(buffer) {}
-
-private:
-    typedef SkLightingColorFilter INHERITED;
 };
 
 class SkLightingColorFilter_NoPin : public SkLightingColorFilter {
+    typedef SkLightingColorFilter INHERITED;
+
 public:
     SkLightingColorFilter_NoPin(SkColor mul, SkColor add)
     : INHERITED(mul, add) {}
@@ -469,9 +466,6 @@ public:
 protected:
     SkLightingColorFilter_NoPin(SkFlattenableReadBuffer& buffer)
         : INHERITED(buffer) {}
-
-private:
-    typedef SkLightingColorFilter INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////