Index: include/core/SkPaint.h |
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h |
index 58cb160adaff7e0e11ed5cd0068f41edac4cceaa..1814cae29dba5b646b9d0a80364e64b3499ce033 100644 |
--- a/include/core/SkPaint.h |
+++ b/include/core/SkPaint.h |
@@ -15,9 +15,6 @@ |
#include "SkDrawLooper.h" |
#include "SkMatrix.h" |
#include "SkXfermode.h" |
-#ifdef SK_BUILD_FOR_ANDROID |
-#include "SkPaintOptionsAndroid.h" |
-#endif |
class SkAnnotation; |
class SkAutoGlyphCache; |
@@ -941,11 +938,6 @@ public: |
#ifdef SK_BUILD_FOR_ANDROID |
uint32_t getGenerationID() const; |
void setGenerationID(uint32_t generationID); |
- |
- const SkPaintOptionsAndroid& getPaintOptionsAndroid() const { |
- return fPaintOptionsAndroid; |
- } |
- void setPaintOptionsAndroid(const SkPaintOptionsAndroid& options); |
#endif |
// returns true if the paint's settings (e.g. xfermode + alpha) resolve to |
@@ -1138,8 +1130,6 @@ private: |
friend class SkCanonicalizePaint; |
#ifdef SK_BUILD_FOR_ANDROID |
- SkPaintOptionsAndroid fPaintOptionsAndroid; |
- |
// In order for the == operator to work properly this must be the last field |
// in the struct so that we can do a memcmp to this field's offset. |
uint32_t fGenerationID; |