mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1607913 - Use Consolas instead of Courier New in Windows monospace font prefs. r=jfkthame 

A number of tests (and expectations) are updated here to either avoid
accidentally relying on the size of Courier New on Windows, or to
explicitly use Courier New instead of monospace, where it's harder to
work out how to rewrite the test correctly.

Differential Revision: https://phabricator.services.mozilla.com/D87222
This commit is contained in:
Cameron McCormack 2022-03-01 11:03:42 +00:00
Родитель 5d9af4370c
Коммит 844fb17be9
25 изменённых файлов: 56 добавлений и 37 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
devtools/client/shared/test/browser_inplace-editor_maxwidth.js
Просмотреть файл

@ -10,7 +10,7 @@ const MAX_WIDTH = 300;
const START_TEXT = "Start text"; const START_TEXT = "Start text";
const LONG_TEXT = const LONG_TEXT =
"I am a long text and I will not fit in a 300px container. " + "I am a long text and I will not fit in a 300px container. " +
"I expect the inplace editor to wrap."; "I expect the inplace editor to wrap over more than two lines.";
// Test the inplace-editor behavior with a maxWidth configuration option // Test the inplace-editor behavior with a maxWidth configuration option
// defined. // defined.

2
dom/events/test/test_continuous_wheel_events.html
Просмотреть файл

@ -9,7 +9,7 @@
</head> </head>
<body onload="bodyLoaded()"> <body onload="bodyLoaded()">
<p id="display"></p> <p id="display"></p>
<div id="scrollable" style="font-family:monospace; font-size: 18px; line-height: 1; overflow: auto; width: 200px; height: 200px;"> <div id="scrollable" style="font-family: 'Courier New', monospace; font-size: 18px; line-height: 1; overflow: auto; width: 200px; height: 200px;">
<div id="scrolled" style="font-size: 64px; width: 5000px; height: 5000px;"> <div id="scrolled" style="font-size: 64px; width: 5000px; height: 5000px;">
Tere is a lot of text. Tere is a lot of text. Tere is a lot of text. Tere is a lot of text. Tere is a lot of text.<br> Tere is a lot of text. Tere is a lot of text. Tere is a lot of text. Tere is a lot of text. Tere is a lot of text.<br>
Tere is a lot of text. Tere is a lot of text. Tere is a lot of text. Tere is a lot of text. Tere is a lot of text.<br> Tere is a lot of text. Tere is a lot of text. Tere is a lot of text. Tere is a lot of text. Tere is a lot of text.<br>

2
layout/reftests/bidi/reftest.list
Просмотреть файл

@ -179,6 +179,6 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3b-rtl.html bra
== 1366623-1.html 1366623-1-ref.html == 1366623-1.html 1366623-1-ref.html
random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1426042-1.html 1426042-1-ref.html # Bug 1392106 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1426042-1.html 1426042-1-ref.html # Bug 1392106
== clone-intrinsic-size-bidi.html clone-intrinsic-size-bidi-ref.html == clone-intrinsic-size-bidi.html clone-intrinsic-size-bidi-ref.html
== slice-intrinsic-size-bidi.html slice-intrinsic-size-bidi-ref.html fuzzy-if(winWidget,70-112,8-8) == slice-intrinsic-size-bidi.html slice-intrinsic-size-bidi-ref.html
== 1556414-1.html 1556414-1-ref.html == 1556414-1.html 1556414-1-ref.html
== 1567036-1.html 1567036-1-ref.html == 1567036-1.html 1567036-1-ref.html

2
layout/reftests/forms/input/text/reftest.list
Просмотреть файл

@ -1,6 +1,6 @@
== bounds-1.html bounds-1-ref.html == bounds-1.html bounds-1-ref.html
fuzzy(0-65,0-3) == size-1.html size-1-ref.html fuzzy(0-65,0-3) == size-1.html size-1-ref.html
== size-2.html size-2-ref.html fuzzy-if(winWidget,0-36,0-1) == size-2.html size-2-ref.html
== baseline-1.html baseline-1-ref.html == baseline-1.html baseline-1-ref.html
== chrome://reftest/content/forms/input/text/centering-1.xhtml chrome://reftest/content/forms/input/text/centering-1-ref.xhtml == chrome://reftest/content/forms/input/text/centering-1.xhtml chrome://reftest/content/forms/input/text/centering-1-ref.xhtml
== chrome://reftest/content/forms/input/text/dynamic-height-1.xhtml chrome://reftest/content/forms/input/text/dynamic-height-1-ref.xhtml == chrome://reftest/content/forms/input/text/dynamic-height-1.xhtml chrome://reftest/content/forms/input/text/dynamic-height-1-ref.xhtml

14
modules/libpref/init/all.js
Просмотреть файл

@ -2662,17 +2662,17 @@ pref("font.size.monospace.x-math", 13);
pref("font.name-list.serif.ar", "Times New Roman"); pref("font.name-list.serif.ar", "Times New Roman");
pref("font.name-list.sans-serif.ar", "Segoe UI, Tahoma, Arial"); pref("font.name-list.sans-serif.ar", "Segoe UI, Tahoma, Arial");
pref("font.name-list.monospace.ar", "Courier New"); pref("font.name-list.monospace.ar", "Consolas");
pref("font.name-list.cursive.ar", "Comic Sans MS"); pref("font.name-list.cursive.ar", "Comic Sans MS");
pref("font.name-list.serif.el", "Times New Roman"); pref("font.name-list.serif.el", "Times New Roman");
pref("font.name-list.sans-serif.el", "Arial"); pref("font.name-list.sans-serif.el", "Arial");
pref("font.name-list.monospace.el", "Courier New"); pref("font.name-list.monospace.el", "Consolas");
pref("font.name-list.cursive.el", "Comic Sans MS"); pref("font.name-list.cursive.el", "Comic Sans MS");
pref("font.name-list.serif.he", "Narkisim, David"); pref("font.name-list.serif.he", "Narkisim, David");
pref("font.name-list.sans-serif.he", "Arial"); pref("font.name-list.sans-serif.he", "Arial");
pref("font.name-list.monospace.he", "Fixed Miriam Transparent, Miriam Fixed, Rod, Courier New"); pref("font.name-list.monospace.he", "Fixed Miriam Transparent, Miriam Fixed, Rod, Consolas, Courier New");
pref("font.name-list.cursive.he", "Guttman Yad, Ktav, Arial"); pref("font.name-list.cursive.he", "Guttman Yad, Ktav, Arial");
pref("font.name-list.serif.ja", "Yu Mincho, MS PMincho, MS Mincho, Meiryo, Yu Gothic, MS PGothic, MS Gothic"); pref("font.name-list.serif.ja", "Yu Mincho, MS PMincho, MS Mincho, Meiryo, Yu Gothic, MS PGothic, MS Gothic");
@ -2691,17 +2691,17 @@ pref("font.size.monospace.x-math", 13);
pref("font.name-list.serif.x-cyrillic", "Times New Roman"); pref("font.name-list.serif.x-cyrillic", "Times New Roman");
pref("font.name-list.sans-serif.x-cyrillic", "Arial"); pref("font.name-list.sans-serif.x-cyrillic", "Arial");
pref("font.name-list.monospace.x-cyrillic", "Courier New"); pref("font.name-list.monospace.x-cyrillic", "Consolas");
pref("font.name-list.cursive.x-cyrillic", "Comic Sans MS"); pref("font.name-list.cursive.x-cyrillic", "Comic Sans MS");
pref("font.name-list.serif.x-unicode", "Times New Roman"); pref("font.name-list.serif.x-unicode", "Times New Roman");
pref("font.name-list.sans-serif.x-unicode", "Arial"); pref("font.name-list.sans-serif.x-unicode", "Arial");
pref("font.name-list.monospace.x-unicode", "Courier New"); pref("font.name-list.monospace.x-unicode", "Consolas");
pref("font.name-list.cursive.x-unicode", "Comic Sans MS"); pref("font.name-list.cursive.x-unicode", "Comic Sans MS");
pref("font.name-list.serif.x-western", "Times New Roman"); pref("font.name-list.serif.x-western", "Times New Roman");
pref("font.name-list.sans-serif.x-western", "Arial"); pref("font.name-list.sans-serif.x-western", "Arial");
pref("font.name-list.monospace.x-western", "Courier New"); pref("font.name-list.monospace.x-western", "Consolas");
pref("font.name-list.cursive.x-western", "Comic Sans MS"); pref("font.name-list.cursive.x-western", "Comic Sans MS");
pref("font.name-list.serif.zh-CN", "SimSun, MS Song, SimSun-ExtB"); pref("font.name-list.serif.zh-CN", "SimSun, MS Song, SimSun-ExtB");
@ -2799,7 +2799,7 @@ pref("font.size.monospace.x-math", 13);
pref("font.name-list.serif.x-math", "Latin Modern Math, STIX Two Math, XITS Math, Cambria Math, Libertinus Math, DejaVu Math TeX Gyre, TeX Gyre Bonum Math, TeX Gyre Pagella Math, TeX Gyre Schola, TeX Gyre Termes Math, STIX Math, Asana Math, STIXGeneral, DejaVu Serif, DejaVu Sans, Times New Roman"); pref("font.name-list.serif.x-math", "Latin Modern Math, STIX Two Math, XITS Math, Cambria Math, Libertinus Math, DejaVu Math TeX Gyre, TeX Gyre Bonum Math, TeX Gyre Pagella Math, TeX Gyre Schola, TeX Gyre Termes Math, STIX Math, Asana Math, STIXGeneral, DejaVu Serif, DejaVu Sans, Times New Roman");
pref("font.name-list.sans-serif.x-math", "Arial"); pref("font.name-list.sans-serif.x-math", "Arial");
pref("font.name-list.monospace.x-math", "Courier New"); pref("font.name-list.monospace.x-math", "Consolas");
pref("font.name-list.cursive.x-math", "Comic Sans MS"); pref("font.name-list.cursive.x-math", "Comic Sans MS");
// ClearType tuning parameters for directwrite/d2d. // ClearType tuning parameters for directwrite/d2d.

1
testing/web-platform/meta/css/css-pseudo/selection-input-011.html.ini
Просмотреть файл

@ -1,6 +1,7 @@
[selection-input-011.html] [selection-input-011.html]
expected: expected:
if os == "mac": PASS if os == "mac": PASS
if os == "win": PASS
if os == "android" and non_native_theme: PASS if os == "android" and non_native_theme: PASS
FAIL FAIL
bug: Test relies on on particular font metrics which are just right on Android. bug: Test relies on on particular font metrics which are just right on Android.

7
testing/web-platform/meta/css/css-pseudo/selection-textarea-011.html.ini
Просмотреть файл

@ -1,7 +1,2 @@
[selection-textarea-011.html] [selection-textarea-011.html]
fuzzy: maxDifference=0-80;totalPixels=0-4 fuzzy: maxDifference=0-80;totalPixels=0-4
expected:
if os == "linux": PASS
if os == "android": PASS
if os == "mac": PASS
FAIL

4
testing/web-platform/meta/css/css-text-decor/text-emphasis-style-008.html.ini Normal file
Просмотреть файл

@ -0,0 +1,4 @@
[text-emphasis-style-008.html]
bug: Fuzz looks massive but it's just a dot antialiased differently
fuzzy:
if os == "win": maxDifference=0-47;totalPixels=0-54

2
testing/web-platform/meta/css/css-text/line-break/line-break-anywhere-001.html.ini Normal file
Просмотреть файл

@ -0,0 +1,2 @@
[line-break-anywhere-001.html]
fuzzy: maxDifference=0-184;totalPixels=0-8

3
testing/web-platform/meta/css/css-text/white-space/line-edge-white-space-collapse-001.html.ini
Просмотреть файл

@ -1,3 +0,0 @@
[line-edge-white-space-collapse-001.html]
expected:
[PASS, FAIL]

3
testing/web-platform/meta/css/css-ui/text-overflow-027.html.ini
Просмотреть файл

@ -1,3 +0,0 @@
[text-overflow-027.html]
expected:
if (os == "win"): FAIL

1
testing/web-platform/meta/uievents/order-of-events/mouse-events/mousemove-between.html.ini
Просмотреть файл

@ -1,6 +1,5 @@
[mousemove-between.html] [mousemove-between.html]
expected: expected:
if os == "mac": ERROR if os == "mac": ERROR
if os == "win": ERROR
[Mousemove events between elements should fire in the correct order.] [Mousemove events between elements should fire in the correct order.]
expected: [PASS, FAIL] expected: [PASS, FAIL]

2
testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-013.html
Просмотреть файл

@ -16,7 +16,7 @@
{ {
font-family: monospace; font-family: monospace;
font-size: 100px; font-size: 100px;
height: 2.8ch; height: 3em;
line-height: 1.5; /* computes to 150px */ line-height: 1.5; /* computes to 150px */
width: 4ch; width: 4ch;

2
testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-014.html
Просмотреть файл

@ -7,7 +7,7 @@
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
<link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow"> <link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow">
<link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout"> <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
<link rel="match" href="reference/contain-layout-ink-overflow-013-ref.html"> <link rel="match" href="reference/contain-layout-ink-overflow-014-ref.html">
<meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its contents must be treated as ink overflow. In this test, the content overflows the div#inner. If such content was treated as 'overflow: visible', then the div#outer would 'pick up' such content and would make it reachable and accessible via its own generated scrollbar. But the overflowed content must be treated as ink overflow and is therefore treated as a graphical effect that is beyond the scrolling mechanism and outside the scrolling mechanism." name="assert"> <meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its contents must be treated as ink overflow. In this test, the content overflows the div#inner. If such content was treated as 'overflow: visible', then the div#outer would 'pick up' such content and would make it reachable and accessible via its own generated scrollbar. But the overflowed content must be treated as ink overflow and is therefore treated as a graphical effect that is beyond the scrolling mechanism and outside the scrolling mechanism." name="assert">

2
testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-017.html
Просмотреть файл

@ -7,7 +7,7 @@
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
<link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow"> <link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow">
<link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout"> <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
<link rel="match" href="reference/contain-layout-ink-overflow-013-ref.html"> <link rel="match" href="reference/contain-layout-ink-overflow-014-ref.html">
<meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its contents must be treated as ink overflow. In this test, the content overflows the div#inner. If such content was treated as 'overflow: visible', then the div#outer would 'pick up' such content and would make it reachable and accessible via its own generated scrollbar. But the overflowed content must be treated as ink overflow and is therefore treated as a graphical effect that is beyond the scrolling mechanism and outside the scrolling mechanism." name="assert"> <meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its contents must be treated as ink overflow. In this test, the content overflows the div#inner. If such content was treated as 'overflow: visible', then the div#outer would 'pick up' such content and would make it reachable and accessible via its own generated scrollbar. But the overflowed content must be treated as ink overflow and is therefore treated as a graphical effect that is beyond the scrolling mechanism and outside the scrolling mechanism." name="assert">

2
testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-013-ref.html
Просмотреть файл

@ -11,7 +11,7 @@
{ {
font-family: monospace; font-family: monospace;
font-size: 100px; font-size: 100px;
height: 2.8ch; height: 3em;
overflow: scroll; overflow: scroll;
width: 4ch; width: 4ch;
} }

24
testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-014-ref.html Normal file
Просмотреть файл

@ -0,0 +1,24 @@
<!DOCTYPE html>
<meta charset="UTF-8">
<title>CSS Reference Test</title>
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
<style>
div
{
font-family: monospace;
font-size: 100px;
height: 2.8ch;
overflow: scroll;
width: 4ch;
}
</style>
<body>
<p>Test passes if there is no red.
<div></div>

2
testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-align-tracks-multi-001-ref.html
Просмотреть файл

@ -9,7 +9,7 @@
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
<style> <style>
html,body { html,body {
color:black; background-color:white; font:15px/1 monospace; padding:0; margin:0; color:black; background-color:white; font:15px/1 "Courier New", monospace; padding:0; margin:0;
} }
grid { grid {
display: inline-grid; display: inline-grid;

2
testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-align-tracks-multi-001.html
Просмотреть файл

@ -11,7 +11,7 @@
<link rel="match" href="masonry-align-tracks-multi-001-ref.html"> <link rel="match" href="masonry-align-tracks-multi-001-ref.html">
<style> <style>
html,body { html,body {
color:black; background-color:white; font:15px/1 monospace; padding:0; margin:0; color:black; background-color:white; font:15px/1 "Courier New", monospace; padding:0; margin:0;
} }
grid { grid {
display: inline-grid; display: inline-grid;

2
testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-gap-001-ref.html
Просмотреть файл

@ -9,7 +9,7 @@
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
<style> <style>
html,body { html,body {
color:black; background-color:white; font:25px/1 monospace; padding:0; margin:0; color:black; background-color:white; font:25px/1 "Courier New", monospace; padding:0; margin:0;
} }
grid { grid {

2
testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-gap-001.html
Просмотреть файл

@ -11,7 +11,7 @@
<link rel="match" href="masonry-gap-001-ref.html"> <link rel="match" href="masonry-gap-001-ref.html">
<style> <style>
html,body { html,body {
color:black; background-color:white; font:25px/1 monospace; padding:0; margin:0; color:black; background-color:white; font:25px/1 "Courier New", monospace; padding:0; margin:0;
} }
grid { grid {

2
testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-justify-tracks-multi-001-ref.html
Просмотреть файл

@ -9,7 +9,7 @@
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
<style> <style>
html,body { html,body {
color:black; background-color:white; font:15px/1 monospace; padding:0; margin:0; color:black; background-color:white; font:15px/1 "Courier New", monospace; padding:0; margin:0;
} }
grid { grid {
display: inline-grid; display: inline-grid;

2
testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-justify-tracks-multi-001.html
Просмотреть файл

@ -11,7 +11,7 @@
<link rel="match" href="masonry-justify-tracks-multi-001-ref.html"> <link rel="match" href="masonry-justify-tracks-multi-001-ref.html">
<style> <style>
html,body { html,body {
color:black; background-color:white; font:15px/1 monospace; padding:0; margin:0; color:black; background-color:white; font:15px/1 "Courier New", monospace; padding:0; margin:0;
} }
grid { grid {
display: inline-grid; display: inline-grid;

4
testing/web-platform/tests/css/css-overflow/reference/webkit-line-clamp-036-ref.html
Просмотреть файл

@ -4,7 +4,7 @@
.clamp { .clamp {
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
width: 150px; width: 10ch;
font: 16px / 32px monospace; font: 16px / 32px monospace;
background-color: yellow; background-color: yellow;
padding: 4px; padding: 4px;
@ -13,5 +13,5 @@
</style> </style>
<div class="clamp"> <div class="clamp">
supercalifragilisticexpialidocious supercalifragilisticexpialidocious
supercalifragi… supercali…
</div> </div>

2
testing/web-platform/tests/css/css-overflow/webkit-line-clamp-036.html
Просмотреть файл

@ -8,7 +8,7 @@
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
width: 150px; width: 10ch;
font: 16px / 32px monospace; font: 16px / 32px monospace;
background-color: yellow; background-color: yellow;
padding: 4px; padding: 4px;