summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-14 10:09:50 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-14 10:09:50 +0100
commitd6e23367ed690aa72e8ace0e4e15d4029367000d (patch)
treee519b4d6b7dfcbb418f5ddd8ce4503a0cae572cf /gfx
parent5401dbbc6b9608e422e0e8c243c13446a6982ea4 (diff)
downloaduxp-d6e23367ed690aa72e8ace0e4e15d4029367000d.tar.gz
Issue mcp-graveyard/UXP#1288 - Part 5: Pass graphite fonts through OTS.
Since the updated OTS supports proper checking of graphite fonts we no longer need to rely of harfbuzz for them.
Diffstat (limited to 'gfx')
-rw-r--r--gfx/thebes/gfxUserFontSet.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/gfx/thebes/gfxUserFontSet.cpp b/gfx/thebes/gfxUserFontSet.cpp
index 72c54d9b5d..e1c55c334e 100644
--- a/gfx/thebes/gfxUserFontSet.cpp
+++ b/gfx/thebes/gfxUserFontSet.cpp
@@ -180,18 +180,9 @@ public:
virtual ots::TableAction GetTableAction(uint32_t aTag) override {
// Preserve Graphite, color glyph and SVG tables
- if (
-#ifdef RELEASE_OR_BETA // For Beta/Release, also allow OT Layout tables through
- // unchecked, and rely on harfbuzz to handle them safely.
- aTag == TRUETYPE_TAG('G', 'D', 'E', 'F') ||
+ if (aTag == TRUETYPE_TAG('G', 'D', 'E', 'F') ||
aTag == TRUETYPE_TAG('G', 'P', 'O', 'S') ||
aTag == TRUETYPE_TAG('G', 'S', 'U', 'B') ||
-#endif
- aTag == TRUETYPE_TAG('S', 'i', 'l', 'f') ||
- aTag == TRUETYPE_TAG('S', 'i', 'l', 'l') ||
- aTag == TRUETYPE_TAG('G', 'l', 'o', 'c') ||
- aTag == TRUETYPE_TAG('G', 'l', 'a', 't') ||
- aTag == TRUETYPE_TAG('F', 'e', 'a', 't') ||
aTag == TRUETYPE_TAG('S', 'V', 'G', ' ') ||
aTag == TRUETYPE_TAG('C', 'O', 'L', 'R') ||
aTag == TRUETYPE_TAG('C', 'P', 'A', 'L')) {