Diff
Modified: branches/safari-614.1.4-branch/LayoutTests/ChangeLog (289914 => 289915)
--- branches/safari-614.1.4-branch/LayoutTests/ChangeLog 2022-02-16 18:49:46 UTC (rev 289914)
+++ branches/safari-614.1.4-branch/LayoutTests/ChangeLog 2022-02-16 18:49:49 UTC (rev 289915)
@@ -1,5 +1,43 @@
2022-02-16 Russell Epstein <repst...@apple.com>
+ Cherry-pick r289869. rdar://problem/88927346
+
+ [ iOS ] fast/text/ch-unit-synthetic-bold.html is failing constantly on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=236610
+
+ Turns out iOS doesn't have Monaco. It's fine though; we can use local() to create
+ a font that doesn't have a bold family member.
+
+ Unreviewed.
+
+ * fast/text/ch-unit-synthetic-bold-expected.html:
+ * fast/text/ch-unit-synthetic-bold.html:
+ * fast/text/tab-width-synthetic-bold-complex-expected.html:
+ * fast/text/tab-width-synthetic-bold-complex.html:
+ * fast/text/tab-width-synthetic-bold-expected.html:
+ * fast/text/tab-width-synthetic-bold.html:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@289869 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-15 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [ iOS ] fast/text/ch-unit-synthetic-bold.html is failing constantly on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=236610
+
+ Turns out iOS doesn't have Monaco. It's fine though; we can use local() to create
+ a font that doesn't have a bold family member.
+
+ Unreviewed.
+
+ * fast/text/ch-unit-synthetic-bold-expected.html:
+ * fast/text/ch-unit-synthetic-bold.html:
+ * fast/text/tab-width-synthetic-bold-complex-expected.html:
+ * fast/text/tab-width-synthetic-bold-complex.html:
+ * fast/text/tab-width-synthetic-bold-expected.html:
+ * fast/text/tab-width-synthetic-bold.html:
+
+2022-02-16 Russell Epstein <repst...@apple.com>
+
Cherry-pick r289864. rdar://problem/88993883
REGRESSION(r289495): [ Monterey arm64 ] model-element/model-element-ready.html is a flaky assertion failure.
Modified: branches/safari-614.1.4-branch/LayoutTests/fast/text/ch-unit-synthetic-bold-expected.html (289914 => 289915)
--- branches/safari-614.1.4-branch/LayoutTests/fast/text/ch-unit-synthetic-bold-expected.html 2022-02-16 18:49:46 UTC (rev 289914)
+++ branches/safari-614.1.4-branch/LayoutTests/fast/text/ch-unit-synthetic-bold-expected.html 2022-02-16 18:49:49 UTC (rev 289915)
@@ -1,11 +1,17 @@
<!DOCTYPE html>
<html>
<head>
+<style>
+@font-face {
+ font-family: DoesNotHaveBold;
+ src: local("Times");
+}
+</style>
</head>
<body>
This test makes sure that the <code>ch</code> unit, which is supposed to be as wide as the <code>0</code> character, is in fact that wide, even if the font is using synthetic bold. The test passes if the width of the green box matches in both cases.
<div>
-<div style="font: bold 16px 'Monaco'; display: inline-block; background: green; color: transparent;">0000000000</div>
+<div style="font: bold 16px 'DoesNotHaveBold'; display: inline-block; background: green; color: transparent;">0000000000</div>
</div>
</body>
</html>
Modified: branches/safari-614.1.4-branch/LayoutTests/fast/text/ch-unit-synthetic-bold.html (289914 => 289915)
--- branches/safari-614.1.4-branch/LayoutTests/fast/text/ch-unit-synthetic-bold.html 2022-02-16 18:49:46 UTC (rev 289914)
+++ branches/safari-614.1.4-branch/LayoutTests/fast/text/ch-unit-synthetic-bold.html 2022-02-16 18:49:49 UTC (rev 289915)
@@ -1,9 +1,15 @@
<!DOCTYPE html>
<html>
<head>
+<style>
+@font-face {
+ font-family: DoesNotHaveBold;
+ src: local("Times");
+}
+</style>
</head>
<body>
This test makes sure that the <code>ch</code> unit, which is supposed to be as wide as the <code>0</code> character, is in fact that wide, even if the font is using synthetic bold. The test passes if the width of the green box matches in both cases.
-<div style="font: bold 16px 'Monaco'; background: green; width: 10ch; color: transparent;">a</div>
+<div style="font: bold 16px 'DoesNotHaveBold'; background: green; width: 10ch; color: transparent;">a</div>
</body>
</html>
Modified: branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold-complex-expected.html (289914 => 289915)
--- branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold-complex-expected.html 2022-02-16 18:49:46 UTC (rev 289914)
+++ branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold-complex-expected.html 2022-02-16 18:49:49 UTC (rev 289915)
@@ -1,11 +1,17 @@
<!DOCTYPE html>
<html>
<head>
+<style>
+@font-face {
+ font-family: DoesNotHaveBold;
+ src: local("Times");
+}
+</style>
</head>
<body>
This test makes sure that, when the width of a tab is set to be a multiple of the space width, that the space width includes the synthetic bold expansion. The test passes if the width of the green box matches in both cases.
<div>
-<pre style="font: bold 16px 'Monaco'; display: inline-block; background: green; tab-size: 16;"> </pre>
+<pre style="font: bold 16px 'DoesNotHaveBold'; display: inline-block; background: green; tab-size: 16;"> </pre>
</div>
</body>
</html>
Modified: branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold-complex.html (289914 => 289915)
--- branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold-complex.html 2022-02-16 18:49:46 UTC (rev 289914)
+++ branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold-complex.html 2022-02-16 18:49:49 UTC (rev 289915)
@@ -1,11 +1,17 @@
<!DOCTYPE html>
<html>
<head>
+<style>
+@font-face {
+ font-family: DoesNotHaveBold;
+ src: local("Times");
+}
+</style>
</head>
<body>
This test makes sure that, when the width of a tab is set to be a multiple of the space width, that the space width includes the synthetic bold expansion. The test passes if the width of the green box matches in both cases.
<div>
-<pre style="font: bold 16px 'Monaco'; font-feature-settings: 'ABCD'; display: inline-block; background: green; tab-size: 16;">	</pre>
+<pre style="font: bold 16px 'DoesNotHaveBold'; font-feature-settings: 'ABCD'; display: inline-block; background: green; tab-size: 16;">	</pre>
</div>
</body>
</html>
Modified: branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold-expected.html (289914 => 289915)
--- branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold-expected.html 2022-02-16 18:49:46 UTC (rev 289914)
+++ branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold-expected.html 2022-02-16 18:49:49 UTC (rev 289915)
@@ -1,11 +1,17 @@
<!DOCTYPE html>
<html>
<head>
+<style>
+@font-face {
+ font-family: DoesNotHaveBold;
+ src: local("Times");
+}
+</style>
</head>
<body>
This test makes sure that, when the width of a tab is set to be a multiple of the space width, that the space width includes the synthetic bold expansion. The test passes if the width of the green box matches in both cases.
<div>
-<pre style="font: bold 16px 'Monaco'; display: inline-block; background: green; tab-size: 16;"> </pre>
+<pre style="font: bold 16px 'DoesNotHaveBold'; display: inline-block; background: green; tab-size: 16;"> </pre>
</div>
</body>
</html>
Modified: branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold.html (289914 => 289915)
--- branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold.html 2022-02-16 18:49:46 UTC (rev 289914)
+++ branches/safari-614.1.4-branch/LayoutTests/fast/text/tab-width-synthetic-bold.html 2022-02-16 18:49:49 UTC (rev 289915)
@@ -1,11 +1,17 @@
<!DOCTYPE html>
<html>
<head>
+<style>
+@font-face {
+ font-family: DoesNotHaveBold;
+ src: local("Times");
+}
+</style>
</head>
<body>
This test makes sure that, when the width of a tab is set to be a multiple of the space width, that the space width includes the synthetic bold expansion. The test passes if the width of the green box matches in both cases.
<div>
-<pre style="font: bold 16px 'Monaco'; display: inline-block; background: green; tab-size: 16;">	</pre>
+<pre style="font: bold 16px 'DoesNotHaveBold'; display: inline-block; background: green; tab-size: 16;">	</pre>
</div>
</body>
</html>
