Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1656156 - Don't do font fallback for unassigned Unicode codepoints; like Private Use characters, only allow these with an explicitly-specified font. r=m_kato

Browse Source 
Depends on D86943

Differential Revision: https://phabricator.services.mozilla.com/D86944
This commit is contained in:
Jonathan Kew 2020-08-17 01:14:54 +00:00
parent d03af0bd0e
commit 8e036b0622
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/thebes/gfxTextRun.cpp
View File

@ -3202,11 +3202,15 @@ gfxFont* gfxFontGroup::FindFontForChar(uint32_t aCh, uint32_t aPrevCh,
}
}
// If character is in Private Use Area, don't do matching against pref or
// system fonts.
// Also don't attempt any fallback for control characters and noncharacters,
// or codepoints where global fallback has already noted a failure.
if (gfxPlatformFontList::PlatformFontList()->SkipFontFallbackForChar(aCh)) {
// If character is in Private Use Area, or is unassigned in Unicode, don't do
// matching against pref or system fonts. We only support such codepoints
// when used with an explicitly-specified font, as they have no standard/
// interoperable meaning.
// Also don't attempt any fallback for control characters or noncharacters,
// where we won't be rendering a glyph anyhow, or for codepoints where global
// fallback has already noted a failure.
if (gfxPlatformFontList::PlatformFontList()->SkipFontFallbackForChar(aCh) ||
GetGeneralCategory(aCh) == HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED) {
return nullptr;
}