From e266a1fc5957961f4048d27d9a94b0ee91eca998 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 14 Nov 2019 10:09:50 +0100 Subject: [PATCH] Issue #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. --- gfx/thebes/gfxUserFontSet.cpp | 11 +---------- 1 file changed, 1 insertion(+), 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')) {