Index: include/utils/SkUnitMappers.h |
diff --git a/include/utils/SkUnitMappers.h b/include/utils/SkUnitMappers.h |
index 64aab5ddee7728dcf040d298b158798f07ceb779..63c7d5f9bcad4edb5f4b862122888a9578c1af56 100644 |
--- a/include/utils/SkUnitMappers.h |
+++ b/include/utils/SkUnitMappers.h |
@@ -15,6 +15,8 @@ |
/** This discretizes the range [0...1) into N discret values. |
*/ |
class SkDiscreteMapper : public SkUnitMapper { |
+ typedef SkUnitMapper INHERITED; |
+ |
public: |
SkDiscreteMapper(int segments); |
// override from SkUnitMapper |
@@ -29,14 +31,14 @@ protected: |
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 |
@@ -46,10 +48,6 @@ public: |
protected: |
SkCosineMapper(SkFlattenableReadBuffer&); |
- |
-private: |
- |
- typedef SkUnitMapper INHERITED; |
}; |
#endif |