diff options
| author |  Herb Derby <herb@google.com> | 2018-05-02 13:01:57 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-07 17:24:29 +0000 |
| commit | 026286031d72d9bde26eb2f2fc4f23c1b454717b (patch) | |
| tree | 37f251da270b785b4ba9d37d3424b97e5ad3f9d1 /src/core/SkGlyph.h | |
| parent | 33fc7fbfce24a0bbd754e0bc6f54a20d88021c06 (diff) | |
Remove android specific code - v2
Change-Id: I2010b168f1a1f3bc48b86a075b0398eaf46ea328
Reviewed-on: https://skia-review.googlesource.com/126480
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src/core/SkGlyph.h')
| -rw-r--r-- | src/core/SkGlyph.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/core/SkGlyph.h b/src/core/SkGlyph.h index 87cd852bd8..dfb51cb35a 100644 --- a/src/core/SkGlyph.h +++ b/src/core/SkGlyph.h @@ -14,7 +14,6 @@ #include "SkMask.h" #include "SkTypes.h" - class SkPath; class SkGlyphCache; @@ -86,12 +85,6 @@ struct SkPackedID { return SkChecksum::CheapMix(fID); } -// FIXME - This is needed because the Android framework directly accesses fID. -// Remove when fID accesses are cleaned up. -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - operator uint32_t() const { return fID; } -#endif - private: static unsigned ID2SubX(uint32_t id) { return id >> (kSubShift + kSubShiftX); @@ -156,12 +149,9 @@ public: uint16_t fWidth, fHeight; int16_t fTop, fLeft; + int8_t fForceBW; uint8_t fMaskFormat; -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - int8_t fRsbDelta, fLsbDelta; // used by auto-kerning -#endif - int8_t fForceBW; void initWithGlyphID(SkPackedGlyphID glyph_id); @@ -217,12 +207,6 @@ public: private: // TODO(herb) remove friend statement after SkGlyphCache cleanup. friend class SkGlyphCache; - -// FIXME - This is needed because the Android frame work directly accesses fID. -// Remove when fID accesses are cleaned up. -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - public: -#endif SkPackedGlyphID fID; }; |