summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devtools/client/shared/test/helper_inplace_editor.js2
-rw-r--r--dom/events/test/test_continuous_wheel_events.html2
-rw-r--r--dom/tests/mochitest/chrome/queryCaretRectWin.html2
-rw-r--r--dom/tests/mochitest/chrome/selectAtPoint.html12
-rw-r--r--layout/generic/crashtests/crashtests.list2
-rw-r--r--layout/reftests/bidi/reftest.list2
-rw-r--r--layout/reftests/css-break/reftest.list2
-rw-r--r--layout/reftests/forms/input/text/reftest.list2
-rw-r--r--modules/libpref/init/all.js12
9 files changed, 16 insertions, 22 deletions
diff --git a/devtools/client/shared/test/helper_inplace_editor.js b/devtools/client/shared/test/helper_inplace_editor.js
index ec6b79e00..9c53557e4 100644
--- a/devtools/client/shared/test/helper_inplace_editor.js
+++ b/devtools/client/shared/test/helper_inplace_editor.js
@@ -52,7 +52,7 @@ function createSpan(doc) {
span.style.display = "inline-block";
span.style.width = "100px";
span.style.border = "1px solid red";
- span.style.fontFamily = "monospace";
+ span.style.fontFamily = "Courier New";
div.style.height = "100%";
div.style.position = "absolute";
diff --git a/dom/events/test/test_continuous_wheel_events.html b/dom/events/test/test_continuous_wheel_events.html
index fc8c69390..e1910afa9 100644
--- a/dom/events/test/test_continuous_wheel_events.html
+++ b/dom/events/test/test_continuous_wheel_events.html
@@ -9,7 +9,7 @@
</head>
<body>
<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'; font-size: 18px; line-height: 1; overflow: auto; width: 200px; height: 200px;">
<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>
diff --git a/dom/tests/mochitest/chrome/queryCaretRectWin.html b/dom/tests/mochitest/chrome/queryCaretRectWin.html
index cd5a8ec64..cb2fe78a1 100644
--- a/dom/tests/mochitest/chrome/queryCaretRectWin.html
+++ b/dom/tests/mochitest/chrome/queryCaretRectWin.html
@@ -20,7 +20,7 @@
left: 0em;
top: 0em;
font-size: 10pt;
- font-family: monospace;
+ font-family: 'Courier New';
line-height: 20px;
letter-spacing: 0px;
margin-top:-1px; /* nix the text area border */
diff --git a/dom/tests/mochitest/chrome/selectAtPoint.html b/dom/tests/mochitest/chrome/selectAtPoint.html
index 8c625e6f7..6326b500f 100644
--- a/dom/tests/mochitest/chrome/selectAtPoint.html
+++ b/dom/tests/mochitest/chrome/selectAtPoint.html
@@ -127,13 +127,7 @@
targetPoint = { xPos: rect.left + ((charDims.width * 4) + (charDims.width / 2)),
yPos: rect.top + (charDims.height / 2) };
setEnd(dwu, targetPoint.xPos, targetPoint.yPos, Ci.nsIDOMWindowUtils.SELECT_CHARACTER);
- if (isLinux || isMac) {
- // XXX I think this is a bug, the right hand selection is 4.5 characters over with a
- // monspaced font. what we want: t(te)s(ts)election1 what we get: t(te)st(se)lection1
- checkSelection(document, "split selection", "tese");
- } else if (isWindows) {
- checkSelection(document, "split selection", "tets");
- }
+ checkSelection(document, "split selection", "tets");
// Trying to select where there's no text, should fail but not throw
let result = dwu.selectAtPoint(rect.left - 20, rect.top - 20, Ci.nsIDOMWindowUtils.SELECT_CHARACTER, false);
@@ -228,7 +222,7 @@
<style type="text/css">
body {
- font-family: monospace;
+ font-family: 'Courier New';
margin-left: 40px;
margin-top: 40px;
padding: 0;
@@ -267,7 +261,7 @@ body {
<br />
-<iframe id="frame1" src="data:text/html,<html><body style='margin: 0; padding: 0; font-family: monospace;' onload='window.parent.onFrameLoad();'><div id='sel2'>ttestselection2 Lorem ipsum dolor sit amet, at duo debet graeci, vivendum vulputate per ut.</div><br/><br/></body></html>"></iframe>
+<iframe id="frame1" src="data:text/html,<html><body style='margin: 0; padding: 0; font-family: \'Courier New\';' onload='window.parent.onFrameLoad();'><div id='sel2'>ttestselection2 Lorem ipsum dolor sit amet, at duo debet graeci, vivendum vulputate per ut.</div><br/><br/></body></html>"></iframe>
<br/>
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index e36a4742f..183556ab9 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -25,7 +25,7 @@ load 321224.xul
load 322780-1.xul
load 323381-1.html
load 323381-2.html
-asserts-if(gtkWidget,1) asserts-if(Android&&asyncPan,1) load 323386-1.html # Bug 718883
+asserts-if(gtkWidget,1) asserts-if(Android&&asyncPan,1) asserts-if(winWidget,1) load 323386-1.html # Bug 718883
load 323389-1.html
load 323389-2.html
load 323493-1.html
diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list
index 83f1db00e..eeabd0beb 100644
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -168,7 +168,7 @@ fuzzy-if(Android,254,231) == brackets-2c-rtl.html brackets-2c-rtl-ref.html
== brackets-3a-ltr.html brackets-3a-ltr-ref.html
== brackets-3a-rtl.html brackets-3a-rtl-ref.html
== brackets-3b-ltr.html brackets-3b-ltr-ref.html
-== brackets-3b-rtl.html brackets-3b-rtl-ref.html
+fuzzy-if(winWidget&&layersGPUAccelerated,49,233) fuzzy-if(winWidget&&!layersGPUAccelerated,56,75) == brackets-3b-rtl.html brackets-3b-rtl-ref.html
== 1217833-1.html 1217833-1-ref.html
== 1217833-2.html 1217833-2-ref.html
== 1231175-1.html 1231175-1-ref.html
diff --git a/layout/reftests/css-break/reftest.list b/layout/reftests/css-break/reftest.list
index 982b51476..5b53e56da 100644
--- a/layout/reftests/css-break/reftest.list
+++ b/layout/reftests/css-break/reftest.list
@@ -2,7 +2,7 @@ default-preferences pref(layout.css.box-decoration-break.enabled,true)
== box-decoration-break-1.html box-decoration-break-1-ref.html
fuzzy(1,20) fuzzy-if(skiaContent,1,700) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html
-fuzzy(16,460) fuzzy-if(Android,10,3673) fuzzy-if(skiaContent,32,254) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html
+fuzzy(16,460) fuzzy-if(Android,10,3673) fuzzy-if(skiaContent,32,254) fuzzy-if(winWidget,32,152) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html
random-if(!gtkWidget) HTTP(..) == box-decoration-break-border-image.html box-decoration-break-border-image-ref.html
== box-decoration-break-block-border-padding.html box-decoration-break-block-border-padding-ref.html
== box-decoration-break-block-margin.html box-decoration-break-block-margin-ref.html
diff --git a/layout/reftests/forms/input/text/reftest.list b/layout/reftests/forms/input/text/reftest.list
index 7f75af36a..87e213e45 100644
--- a/layout/reftests/forms/input/text/reftest.list
+++ b/layout/reftests/forms/input/text/reftest.list
@@ -1,5 +1,5 @@
== bounds-1.html bounds-1-ref.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,140,111) == size-1.html size-1-ref.html
+fuzzy-if(asyncPan&&!layersGPUAccelerated,140,111) fuzzy-if(winWidget&&layersGPUAccelerated,98,108) fuzzy-if(winWidget&&!layersGPUAccelerated,140,108) == size-1.html size-1-ref.html
== size-2.html size-2-ref.html
HTTP(..) == baseline-1.html baseline-1-ref.html
HTTP(..) == centering-1.xul centering-1-ref.xul
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 96ebe0990..a7d8926da 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -3195,12 +3195,12 @@ pref("font.name-list.emoji", "Twemoji Mozilla");
pref("font.name.serif.ar", "Times New Roman");
pref("font.name.sans-serif.ar", "Segoe UI");
pref("font.name-list.sans-serif.ar", "Segoe UI, Tahoma, Arial");
-pref("font.name.monospace.ar", "Courier New");
+pref("font.name.monospace.ar", "Consolas");
pref("font.name.cursive.ar", "Comic Sans MS");
pref("font.name.serif.el", "Times New Roman");
pref("font.name.sans-serif.el", "Arial");
-pref("font.name.monospace.el", "Courier New");
+pref("font.name.monospace.el", "Consolas");
pref("font.name.cursive.el", "Comic Sans MS");
pref("font.name.serif.he", "Narkisim");
@@ -3235,17 +3235,17 @@ pref("font.name.cursive.th", "Tahoma");
pref("font.name.serif.x-cyrillic", "Times New Roman");
pref("font.name.sans-serif.x-cyrillic", "Arial");
-pref("font.name.monospace.x-cyrillic", "Courier New");
+pref("font.name.monospace.x-cyrillic", "Consolas");
pref("font.name.cursive.x-cyrillic", "Comic Sans MS");
pref("font.name.serif.x-unicode", "Times New Roman");
pref("font.name.sans-serif.x-unicode", "Arial");
-pref("font.name.monospace.x-unicode", "Courier New");
+pref("font.name.monospace.x-unicode", "Consolas");
pref("font.name.cursive.x-unicode", "Comic Sans MS");
pref("font.name.serif.x-western", "Times New Roman");
pref("font.name.sans-serif.x-western", "Arial");
-pref("font.name.monospace.x-western", "Courier New");
+pref("font.name.monospace.x-western", "Consolas");
pref("font.name.cursive.x-western", "Comic Sans MS");
pref("font.name.serif.zh-CN", "SimSun");
@@ -3391,7 +3391,7 @@ pref("font.name.serif.x-math", "Latin Modern Math");
// We have special support for Monotype Symbol on Windows.
pref("font.name-list.serif.x-math", "Latin Modern 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, Symbol, Times New Roman");
pref("font.name.sans-serif.x-math", "Arial");
-pref("font.name.monospace.x-math", "Courier New");
+pref("font.name.monospace.x-math", "Consolas");
pref("font.name.cursive.x-math", "Comic Sans MS");
// ClearType tuning parameters for directwrite/d2d.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 08:11:15 +0000