Fix for potential typedef issue

include/utils/SkUnitMappers.h

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkUnitMappers_DEFINED
 #define SkUnitMappers_DEFINED
 
 #include "SkUnitMapper.h"
 
 /** This discretizes the range [0...1) into N discret values.
 */
 class SkDiscreteMapper : public SkUnitMapper {
+    typedef SkUnitMapper INHERITED;
+
 public:
     SkDiscreteMapper(int segments);
     // override from SkUnitMapper
     virtual uint16_t mapUnit16(uint16_t x);
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiscreteMapper)
 
 protected:
     SkDiscreteMapper(SkFlattenableReadBuffer& );
     virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
 
 private:
     int     fSegments;
     SkFract fScale;    // computed from fSegments
-
-    typedef SkUnitMapper INHERITED;
 };
 
 /** This returns cos(x), to simulate lighting a sphere, where 0 maps to the
     center of the sphere, and 1 maps to the edge.
 */
 class SkCosineMapper : public SkUnitMapper {
+    typedef SkUnitMapper INHERITED;
+
 public:
     SkCosineMapper() {}
     // override from SkUnitMapper
     virtual uint16_t mapUnit16(uint16_t x);
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkCosineMapper)
 
 protected:
     SkCosineMapper(SkFlattenableReadBuffer&);
-
-private:
-
-    typedef SkUnitMapper INHERITED;
 };
 
 #endif