diff options
| author |  Mike Klein <mtklein@google.com> | 2018-05-02 13:52:58 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-02 13:53:08 +0000 |
| commit | bffeb8cbf66c6ba9e2787f61ad447dc3b6be7cc1 (patch) | |
| tree | 8a383864c38e12d13f44a94c28c2b5edfaf0a142 /src/core/SkGlyph.h | |
| parent | 2050565fe116008ad6df7533900f5f76dd5b9730 (diff) | |
Revert "Add padding back to make msan happy"
This reverts commit 2050565fe116008ad6df7533900f5f76dd5b9730.
Reason for revert: 1 of 5
Original change's description:
> Add padding back to make msan happy
>
> SkGlyph are stored directly in the hash table with uninitialized
> pad bytes. When the hash table is resized, the uninitialized pad
> bytes are moved causing msan to complain.
>
> Change-Id: I559ff1bd369d12be061cce7d3c826c2afdd3a03c
> Reviewed-on: https://skia-review.googlesource.com/125240
> Commit-Queue: Herb Derby <herb@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>
> Auto-Submit: Herb Derby <herb@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,herb@google.com
Change-Id: Iaa61ad17c837544bd7394ddc6fc52c14d8389d7e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/125260
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 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/SkGlyph.h b/src/core/SkGlyph.h index 959f9b78c8..87cd852bd8 100644 --- a/src/core/SkGlyph.h +++ b/src/core/SkGlyph.h @@ -131,10 +131,6 @@ struct SkPackedUnicharID : public SkPackedID { } }; -// Because SkGlyph is used directly in a hash table, it can be moved around using memcpy, and any -// uninitialized pad bytes will be considered uninitialized. Make sure all pad bytes have an -// initialized value. -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, @@ -164,9 +160,6 @@ public: uint8_t fMaskFormat; #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK int8_t fRsbDelta, fLsbDelta; // used by auto-kerning -#else - int8_t pad0{0}, pad1{0}; // It's simplest to add pads here. This will all change once - // we rip androids hand out of this data structure. #endif int8_t fForceBW; @@ -232,6 +225,5 @@ public: #endif SkPackedGlyphID fID; }; -SK_END_REQUIRE_DENSE #endif |