diff options
| author |  Herb Derby <herb@google.com> | 2018-05-01 11:57:56 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-02 15:15:08 +0000 |
| commit | fcac00f2f19e345e813f38f7fc9372b6d6eebf4b (patch) | |
| tree | 5c6b360d138b00a3d5d9c167d2f71ad43451e7e9 /src/core/SkGlyph.h | |
| parent | efe39bcfb82ddf8404b1df6f58809ff53dff4b99 (diff) | |
Reland "Remove devKerning"
This is a reland of c86c5c0144b85d0bc8ec791f9609ee2d4e7d835a
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>
Change-Id: Ibf5fac5f1442c7e62392d5146ad460da27b10d5c
Reviewed-on: https://skia-review.googlesource.com/125300
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Herb Derby <herb@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 211039e520..87cd852bd8 100644 --- a/src/core/SkGlyph.h +++ b/src/core/SkGlyph.h @@ -131,7 +131,6 @@ 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, @@ -159,7 +158,9 @@ 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); @@ -224,6 +225,5 @@ public: #endif SkPackedGlyphID fID; }; -SK_END_REQUIRE_DENSE #endif |