diff options
| author |  Mike Klein <mtklein@google.com> | 2018-05-02 13:53:53 +0000 |
|---|---|---|
| committer | Mike Klein <mtklein@google.com> | 2018-05-02 13:54:54 +0000 |
| commit | c76e26a6bb8af9ac9b0c7226851b2ded12d18687 (patch) | |
| tree | 368bb3cfb1d09e08cfb59cbf666b3e1769267640 /src/core/SkGlyph.h | |
| parent | 78a9aed075ecb342545d913bc92ef9abc6431b49 (diff) | |
Revert "Remove devKerning"
This reverts commit c86c5c0144b85d0bc8ec791f9609ee2d4e7d835a.
Reason for revert: 4 of 5
Original change's description:
> Remove devKerning
>
> Dev kerning is not supported by any scalers. This is
> mostly removed. The remaining fields fRsbDelta and
> fLsbDelta are kept to keep Android compiling.
>
> Change-Id: If1a9ee9bb599d4e1bdf4b3751ac0c65246350809
> Reviewed-on: https://skia-review.googlesource.com/124921
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Herb Derby <herb@google.com>
TBR=bungeman@google.com,herb@google.com,reed@google.com
Change-Id: If865f702868192a1b72cd811baa996dd1282bbce
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/125263
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/core/SkGlyph.h')
| -rw-r--r-- | src/core/SkGlyph.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkGlyph.h b/src/core/SkGlyph.h index 87cd852bd8..211039e520 100644 --- a/src/core/SkGlyph.h +++ b/src/core/SkGlyph.h @@ -131,6 +131,7 @@ struct SkPackedUnicharID : public SkPackedID { } }; +SK_BEGIN_REQUIRE_DENSE class SkGlyph { // Support horizontal and vertical skipping strike-through / underlines. // The caller walks the linked list looking for a match. For a horizontal underline, @@ -158,9 +159,7 @@ public: int16_t fTop, fLeft; 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); @@ -225,5 +224,6 @@ public: #endif SkPackedGlyphID fID; }; +SK_END_REQUIRE_DENSE #endif |