Commit ed0a7da8 authored by Jonathan Kew's avatar Jonathan Kew
Browse files

Bug 1834316 - Don't mask Arabic comma/semicolon/question-mark from the font's... 

Bug 1834316 - Don't mask Arabic comma/semicolon/question-mark from the font's cmap when 'arab' script support is absent, because they may be used with other scripts such as N'Ko. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D178693
parent f27b7d97

gfx/thebes/gfxPlatformFontList.cpp

+7 −1
Original line number Diff line number Diff line
@@ -77,7 +77,13 @@ const gfxFontEntry::ScriptRange gfxPlatformFontList::sComplexScriptRanges[] = { 
    // want to mask the basic Arabic block here?

    // This affects the arabic-fallback-*.html reftests, which rely on

    // loading a font that *doesn't* have any GSUB table.

    {0x0600, 0x06FF, 1, {TRUETYPE_TAG('a', 'r', 'a', 'b'), 0, 0}},

    {0x0600, 0x060B, 1, {TRUETYPE_TAG('a', 'r', 'a', 'b'), 0, 0}},

    // skip 060C Arabic comma, also used by N'Ko etc

    {0x060D, 0x061A, 1, {TRUETYPE_TAG('a', 'r', 'a', 'b'), 0, 0}},

    // skip 061B Arabic semicolon, also used by N'Ko etc

    {0x061C, 0x061E, 1, {TRUETYPE_TAG('a', 'r', 'a', 'b'), 0, 0}},

    // skip 061F Arabic question mark, also used by N'Ko etc

    {0x0620, 0x06FF, 1, {TRUETYPE_TAG('a', 'r', 'a', 'b'), 0, 0}},

    {0x0700, 0x074F, 1, {TRUETYPE_TAG('s', 'y', 'r', 'c'), 0, 0}},

    {0x0750, 0x077F, 1, {TRUETYPE_TAG('a', 'r', 'a', 'b'), 0, 0}},

    {0x08A0, 0x08FF, 1, {TRUETYPE_TAG('a', 'r', 'a', 'b'), 0, 0}},

layout/reftests/bugs/1834316-1-notref.html

0 → 100644
+15 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<meta charset=utf-8>

<style>

div {

  font: 50px/2 "Noto Sans NKo", serif;

  height: 3em;

}

span {

  font-family: serif;

}

</style>

<p>The following characters should be rendered with the Noto Sans NKo font:</p>

<div><span>&#x060C;</span>&nbsp;<span>&#x061B;</span>&nbsp;<span>&#x061F;</span></div>

<p>This should be <em>different</em> from the default serif rendering:</p>

<div><span>&#x060C;</span>&nbsp;<span>&#x061B;</span>&nbsp;<span>&#x061F;</span></div>

layout/reftests/bugs/1834316-1.html

0 → 100644
+15 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<meta charset=utf-8>

<style>

div {

  font: 50px/2 "Noto Sans NKo", serif;

  height: 3em;

}

span {

  font-family: serif;

}

</style>

<p>The following characters should be rendered with the Noto Sans NKo font:</p>

<div>&#x060C;&nbsp;&#x061B;&nbsp;&#x061F;</div>

<p>This should be <em>different</em> from the default serif rendering:</p>

<div><span>&#x060C;</span>&nbsp;<span>&#x061B;</span>&nbsp;<span>&#x061F;</span></div>

layout/reftests/bugs/reftest.list

+1 −0
Original line number Diff line number Diff line
@@ -2140,3 +2140,4 @@ pref(image.downscale-during-decode.enabled,true) == 1804872-3.html 1804872-3-ref 
== 1827009-1.html 1827009-1-ref.html

pref(layout.testing.overlay-scrollbars.always-visible,true) pref(ui.useOverlayScrollbars,1) == 1827337-1.html 1827337-1-ref.html

pref(layout.testing.overlay-scrollbars.always-visible,true) pref(ui.useOverlayScrollbars,1) fuzzy-if(winWidget,0-21,0-134) fuzzy-if(cocoaWidget,0-2,0-12) == 1828879-1.html 1828879-1-ref.html

skip-if(!OSX) != 1834316-1.html 1834316-1-notref.html