Index: src/core/SkScalerContext.h |
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h |
index 43b5ebfaf6a71f8ad7f18f42f60493674ea15a3f..609e9dd673672950583e032ad2cbd53da93ec7f4 100644 |
--- a/src/core/SkScalerContext.h |
+++ b/src/core/SkScalerContext.h |
@@ -14,10 +14,6 @@ |
#include "SkPaint.h" |
#include "SkTypeface.h" |
-#ifdef SK_BUILD_FOR_ANDROID |
- #include "SkPaintOptionsAndroid.h" |
-#endif |
- |
struct SkGlyph; |
class SkDescriptor; |
class SkMaskFilter; |
@@ -262,10 +258,6 @@ private: |
// never null |
SkAutoTUnref<SkTypeface> fTypeface; |
-#ifdef SK_BUILD_FOR_ANDROID |
- SkPaintOptionsAndroid fPaintOptionsAndroid; |
-#endif |
- |
// optional object, which may be null |
SkPathEffect* fPathEffect; |
SkMaskFilter* fMaskFilter; |
@@ -297,9 +289,6 @@ private: |
#define kPathEffect_SkDescriptorTag SkSetFourByteTag('p', 't', 'h', 'e') |
#define kMaskFilter_SkDescriptorTag SkSetFourByteTag('m', 's', 'k', 'f') |
#define kRasterizer_SkDescriptorTag SkSetFourByteTag('r', 'a', 's', 't') |
-#ifdef SK_BUILD_FOR_ANDROID |
-#define kAndroidOpts_SkDescriptorTag SkSetFourByteTag('a', 'n', 'd', 'r') |
-#endif |
/////////////////////////////////////////////////////////////////////////////// |