Diff
Modified: trunk/LayoutTests/ChangeLog (282871 => 282872)
--- trunk/LayoutTests/ChangeLog 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/ChangeLog 2021-09-22 13:25:48 UTC (rev 282872)
@@ -1,3 +1,25 @@
+2021-09-22 Alan Bujtas <za...@apple.com>
+
+ [LFC][IFC] Add fallback font support
+ https://bugs.webkit.org/show_bug.cgi?id=228685
+ <rdar://problem/81661514>
+
+ Reviewed by Antti Koivisto.
+
+ * TestExpectations:
+ * fast/text/multiple-feature-properties-expected.html: see webkit.org/b/206168
+ * fast/text/multiple-feature-properties.html:
+ * fast/text/simple-line-layout-do-not-support-unicode-range-expected.html: Removed.
+ * fast/text/simple-line-layout-do-not-support-unicode-range.html: Removed.
+ * fast/text/simple-line-layout-no-surrogate-pairs-expected.html: Removed.
+ * fast/text/simple-line-layout-no-surrogate-pairs.html: Removed.
+ * platform/ios-14/TestExpectations:
+ * platform/ios/TestExpectations:
+ * platform/ios/fast/css/font-face-implicit-local-font-expected.txt:
+ * platform/mac-bigsur/fast/text/capitalize-boundaries-expected.txt:
+ * platform/mac-catalina/fast/text/capitalize-boundaries-expected.txt: unused soft hyphens make the lines grow
+ * platform/mac/fast/text/international/003-expected.txt:
+
2021-09-22 Cameron McCormack <hey...@apple.com>
Tweak canvas test failure expectations to be more accurate
Modified: trunk/LayoutTests/TestExpectations (282871 => 282872)
--- trunk/LayoutTests/TestExpectations 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/TestExpectations 2021-09-22 13:25:48 UTC (rev 282872)
@@ -3701,6 +3701,9 @@
# pre-wrap progression. Other rendering engines agree with the result.
webkit.org/b/206168 [ Debug ] fast/dom/insert-span-into-long-text-bug-28245.html [ Skip ]
+# needs support in IFC
+webkit.org/b/230593 fast/inline/kerning-across-inline-boxes.html [ Skip ]
+
webkit.org/b/206676 imported/w3c/web-platform-tests/requestidlecallback/callback-xhr-sync.html [ Pass Failure ]
# wpt intersection-observer failures
Added: trunk/LayoutTests/fast/inline/kerning-across-inline-boxes-expected.html (0 => 282872)
--- trunk/LayoutTests/fast/inline/kerning-across-inline-boxes-expected.html (rev 0)
+++ trunk/LayoutTests/fast/inline/kerning-across-inline-boxes-expected.html 2021-09-22 13:25:48 UTC (rev 282872)
@@ -0,0 +1 @@
+<div style="font-family: FontWithFeaturesOTF;"><span>the space between these inline-boxes should utilize kerning</span></div>
Added: trunk/LayoutTests/fast/inline/kerning-across-inline-boxes.html (0 => 282872)
--- trunk/LayoutTests/fast/inline/kerning-across-inline-boxes.html (rev 0)
+++ trunk/LayoutTests/fast/inline/kerning-across-inline-boxes.html 2021-09-22 13:25:48 UTC (rev 282872)
@@ -0,0 +1 @@
+<div style="font-family: FontWithFeaturesOTF;"><span>the space between these inline-boxes</span> <span>should utilize kerning</span></div>
Modified: trunk/LayoutTests/fast/text/multiple-feature-properties-expected.html (282871 => 282872)
--- trunk/LayoutTests/fast/text/multiple-feature-properties-expected.html 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/fast/text/multiple-feature-properties-expected.html 2021-09-22 13:25:48 UTC (rev 282872)
@@ -4,17 +4,6 @@
</head>
<body>
This test makes sure that feature resolution order is honored. For more information, click <a href="" The test passes if there is a particular sequence of Xs and check marks below.
-<div style="font-family: FontWithFeaturesOTF;">
-<span>B</span>
-<span>B</span>
-<span>A</span>
-<span>B</span>
-<span>A</span>
-<span>B</span>
-<span>A</span>
-<span>B</span>
-<span>B</span>
-<span>A</span>
-</div>
+<div style="font-family: FontWithFeaturesOTF;"><span>B</span><span>B</span><span>A</span><span>B</span><span>A</span><span>B</span><span>A</span><span>B</span><span>B</span><span>A</span></div>
</body>
</html>
Modified: trunk/LayoutTests/fast/text/multiple-feature-properties.html (282871 => 282872)
--- trunk/LayoutTests/fast/text/multiple-feature-properties.html 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/fast/text/multiple-feature-properties.html 2021-09-22 13:25:48 UTC (rev 282872)
@@ -4,17 +4,6 @@
</head>
<body>
This test makes sure that feature resolution order is honored. For more information, click <a href="" The test passes if there is a particular sequence of Xs and check marks below.
-<div style="font-family: FontWithFeaturesOTF;">
-<span style="font-variant-ligatures: common-ligatures; text-rendering: optimizeSpeed;">C</span>
-<span style="font-variant-ligatures: no-common-ligatures; text-rendering: optimizeSpeed;">C</span>
-<span style="font-variant-ligatures: common-ligatures; text-rendering: optimizeLegibility;">C</span>
-<span style="font-variant-ligatures: no-common-ligatures; text-rendering: optimizeLegibility;">C</span>
-<span style="font-feature-settings: 'liga' 1, 'clig' 1; text-rendering: optimizeSpeed;">C</span>
-<span style="font-feature-settings: 'liga' 0, 'clig' 0; text-rendering: optimizeSpeed;">C</span>
-<span style="font-feature-settings: 'liga' 1, 'clig' 1; text-rendering: optimizeLegibility;">C</span>
-<span style="font-feature-settings: 'liga' 0, 'clig' 0; text-rendering: optimizeLegibility;">C</span>
-<span style="font-variant-ligatures: common-ligatures; font-feature-settings: 'liga' 0, 'clig' 0;">C</span>
-<span style="font-variant-ligatures: no-common-ligatures; font-feature-settings: 'liga' 1, 'clig' 1;">C</span>
-</div>
+<div style="font-family: FontWithFeaturesOTF;"><span style="font-variant-ligatures: common-ligatures; text-rendering: optimizeSpeed;">C</span><span style="font-variant-ligatures: no-common-ligatures; text-rendering: optimizeSpeed;">C</span><span style="font-variant-ligatures: common-ligatures; text-rendering: optimizeLegibility;">C</span><span style="font-variant-ligatures: no-common-ligatures; text-rendering: optimizeLegibility;">C</span><span style="font-feature-settings: 'liga' 1, 'clig' 1; text-rendering: optimizeSpeed;">C</span><span style="font-feature-settings: 'liga' 0, 'clig' 0; text-rendering: optimizeSpeed;">C</span><span style="font-feature-settings: 'liga' 1, 'clig' 1; text-rendering: optimizeLegibility;">C</span><span style="font-feature-settings: 'liga' 0, 'clig' 0; text-rendering:
optimizeLegibility;">C</span><span style="font-variant-ligatures: common-ligatures; font-feature-settings: 'liga' 0, 'clig' 0;">C</span><span style="font-variant-ligatures: no-common-ligatures; font-feature-settings: 'liga' 1, 'clig' 1;">C</span></div>
</body>
</html>
Deleted: trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range-expected.html (282871 => 282872)
--- trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range-expected.html 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range-expected.html 2021-09-22 13:25:48 UTC (rev 282872)
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Simple line layout can't work with insufficient primary font.</title>
-<style>
-@font-face {
- font-family: Monaco;
- unicode-range: U+0060-0080;
- src: local(Times);
-}
-</style>
-<script>
-if (window.internals) {
- internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
- internals.settings.setSimpleLineLayoutEnabled(false);
-}
-</script>
-</head>
-<body>
-<p style="font-family: Monaco;">THIS SHOULD HAVE legacy line layout coverage indicator.</p>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range.html (282871 => 282872)
--- trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range.html 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range.html 2021-09-22 13:25:48 UTC (rev 282872)
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Simple line layout can't work with insufficient primary font.</title>
-<style>
-@font-face {
- font-family: Monaco;
- unicode-range: U+0060-0080;
- src: local(Times);
-}
-</style>
-<script>
-if (window.internals) {
- internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
- internals.settings.setSimpleLineLayoutEnabled(true);
-}
-</script>
-</head>
-<body>
-<p style="font-family: Monaco;">THIS SHOULD HAVE legacy line layout coverage indicator.</p>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html (282871 => 282872)
--- trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html 2021-09-22 13:25:48 UTC (rev 282872)
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>This tests that we don't use simple line layout for surrogate pairs.</title>
-<style>
-div {
- color: white;
- font-family: Arial;
-}
-</style>
-<script>
-if (window.internals) {
- internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
- internals.settings.setSimpleLineLayoutEnabled(false);
-}
-</script>
-</head>
-<body>
-<div>�</div>
-<div>𝌆</div>
-<div>�</div>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html (282871 => 282872)
--- trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html 2021-09-22 13:25:48 UTC (rev 282872)
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>This tests that we don't use simple line layout for surrogate pairs.</title>
-<style>
-div {
- color: white;
- font-family: Arial;
-}
-</style>
-<script>
-if (window.internals) {
- internals.settings.setSimpleLineLayoutEnabled(true);
- internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
-}
-</script>
-</head>
-<body>
-<div>�</div>
-<div>𝌆</div>
-<div>�</div>
-</body>
-</html>
Modified: trunk/LayoutTests/platform/ios/TestExpectations (282871 => 282872)
--- trunk/LayoutTests/platform/ios/TestExpectations 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/platform/ios/TestExpectations 2021-09-22 13:25:48 UTC (rev 282872)
@@ -3391,9 +3391,6 @@
# rdar://80386061 ([ iOS15 ] fast/events/touch/ios/long-press-on-editable-content-then-drag-up-to-change-selected-text.html [ Failure ])
fast/events/touch/ios/long-press-on-editable-content-then-drag-up-to-change-selected-text.html [ Failure ]
-# rdar://80392559 ([ iOS15 ] fast/text/simple-line-layout-do-not-support-unicode-range.html is a constant failure)
-fast/text/simple-line-layout-do-not-support-unicode-range.html [ ImageOnlyFailure ]
-
# rdar://80392665 ([ iOS15 ] fast/text/simple-line-wordspacing.html is a constant failure)
fast/text/simple-line-wordspacing.html [ ImageOnlyFailure ]
Modified: trunk/LayoutTests/platform/ios/fast/css/font-face-implicit-local-font-expected.txt (282871 => 282872)
--- trunk/LayoutTests/platform/ios/fast/css/font-face-implicit-local-font-expected.txt 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/platform/ios/fast/css/font-face-implicit-local-font-expected.txt 2021-09-22 13:25:48 UTC (rev 282872)
@@ -13,8 +13,8 @@
RenderText {#text} at (0,0) size 523x19
text run at (0,0) width 455: "In the next line, the digits should be in Times, but the letters should be "
text run at (454,0) width 69: "in Courier."
- RenderBlock (anonymous) at (0,92) size 784x30
+ RenderBlock (anonymous) at (0,92) size 784x28
RenderInline {SPAN} at (0,0) size 279x25
- RenderText {#text} at (0,4) size 279x25
- text run at (0,4) width 279: "ABCDEFGHIJ 1234567890"
+ RenderText {#text} at (0,3) size 279x25
+ text run at (0,3) width 279: "ABCDEFGHIJ 1234567890"
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/ios-14/TestExpectations (282871 => 282872)
--- trunk/LayoutTests/platform/ios-14/TestExpectations 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/platform/ios-14/TestExpectations 2021-09-22 13:25:48 UTC (rev 282872)
@@ -45,9 +45,6 @@
# rdar://80383672 ([ iOS15 ] accessibility/misspelling-range.html is failing)
accessibility/misspelling-range.html [ Pass ]
-# rdar://80392559 ([ iOS15 ] fast/text/simple-line-layout-do-not-support-unicode-range.html is a constant failure)
-fast/text/simple-line-layout-do-not-support-unicode-range.html [ Pass ]
-
# rdar://80392665 ([ iOS15 ] fast/text/simple-line-wordspacing.html is a constant failure)
fast/text/simple-line-wordspacing.html [ Pass ]
Modified: trunk/LayoutTests/platform/mac/fast/text/international/003-expected.txt (282871 => 282872)
--- trunk/LayoutTests/platform/mac/fast/text/international/003-expected.txt 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/platform/mac/fast/text/international/003-expected.txt 2021-09-22 13:25:48 UTC (rev 282872)
@@ -3,11 +3,11 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderTable {TABLE} at (0,0) size 784x372 [border: (5px outset #808080)]
- RenderTableSection {TBODY} at (5,5) size 774x362
- RenderTableRow {TR} at (0,2) size 774x358
- RenderTableCell {TD} at (2,179) size 716x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (720,2) size 52x358 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+ RenderTable {TABLE} at (0,0) size 784x370 [border: (5px outset #808080)]
+ RenderTableSection {TBODY} at (5,5) size 774x360
+ RenderTableRow {TR} at (0,2) size 774x356
+ RenderTableCell {TD} at (2,178) size 716x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (720,2) size 52x356 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
RenderInline {A} at (0,0) size 32x18 [color=#0000EE]
RenderText {#text} at (2,5) size 32x18
text run at (2,5) width 32: "\x{5CA1}\x{5C71}"
@@ -43,40 +43,40 @@
text run at (2,137) width 32: "\x{9AD8}\x{77E5}"
RenderText {#text} at (34,137) size 16x18
text run at (34,137) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x42 [color=#0000EE]
- RenderText {#text} at (2,159) size 48x42
+ RenderInline {A} at (0,0) size 48x40 [color=#0000EE]
+ RenderText {#text} at (2,159) size 48x40
text run at (2,159) width 48: "\x{798F}\x{5CA1}\x{30FB}"
- text run at (2,183) width 48: "\x{5317}\x{4E5D}\x{5DDE}"
- RenderText {#text} at (2,205) size 16x18
- text run at (2,205) width 16: "\x{FF5C}"
+ text run at (2,181) width 48: "\x{5317}\x{4E5D}\x{5DDE}"
+ RenderText {#text} at (2,203) size 16x18
+ text run at (2,203) width 16: "\x{FF5C}"
RenderInline {A} at (0,0) size 32x18 [color=#0000EE]
- RenderText {#text} at (18,205) size 32x18
- text run at (18,205) width 32: "\x{4F50}\x{8CC0}"
- RenderText {#text} at (2,227) size 16x18
- text run at (2,227) width 16: "\x{FF5C}"
+ RenderText {#text} at (18,203) size 32x18
+ text run at (18,203) width 32: "\x{4F50}\x{8CC0}"
+ RenderText {#text} at (2,225) size 16x18
+ text run at (2,225) width 16: "\x{FF5C}"
RenderInline {A} at (0,0) size 32x18 [color=#0000EE]
- RenderText {#text} at (18,227) size 32x18
- text run at (18,227) width 32: "\x{9577}\x{5D0E}"
- RenderText {#text} at (2,249) size 16x18
- text run at (2,249) width 16: "\x{FF5C}"
+ RenderText {#text} at (18,225) size 32x18
+ text run at (18,225) width 32: "\x{9577}\x{5D0E}"
+ RenderText {#text} at (2,247) size 16x18
+ text run at (2,247) width 16: "\x{FF5C}"
RenderInline {A} at (0,0) size 32x18 [color=#0000EE]
- RenderText {#text} at (18,249) size 32x18
- text run at (18,249) width 32: "\x{718A}\x{672C}"
- RenderText {#text} at (2,271) size 16x18
- text run at (2,271) width 16: "\x{FF5C}"
+ RenderText {#text} at (18,247) size 32x18
+ text run at (18,247) width 32: "\x{718A}\x{672C}"
+ RenderText {#text} at (2,269) size 16x18
+ text run at (2,269) width 16: "\x{FF5C}"
RenderInline {A} at (0,0) size 32x18 [color=#0000EE]
- RenderText {#text} at (18,271) size 32x18
- text run at (18,271) width 32: "\x{5927}\x{5206}"
- RenderText {#text} at (2,293) size 16x18
- text run at (2,293) width 16: "\x{FF5C}"
+ RenderText {#text} at (18,269) size 32x18
+ text run at (18,269) width 32: "\x{5927}\x{5206}"
+ RenderText {#text} at (2,291) size 16x18
+ text run at (2,291) width 16: "\x{FF5C}"
RenderInline {A} at (0,0) size 32x18 [color=#0000EE]
- RenderText {#text} at (18,293) size 32x18
- text run at (18,293) width 32: "\x{5BAE}\x{5D0E}"
- RenderText {#text} at (2,315) size 16x18
- text run at (2,315) width 16: "\x{FF5C}"
+ RenderText {#text} at (18,291) size 32x18
+ text run at (18,291) width 32: "\x{5BAE}\x{5D0E}"
+ RenderText {#text} at (2,313) size 16x18
+ text run at (2,313) width 16: "\x{FF5C}"
RenderInline {A} at (0,0) size 48x40 [color=#0000EE]
- RenderText {#text} at (18,315) size 48x40
- text run at (18,315) width 32: "\x{9E7F}\x{5150}"
- text run at (2,337) width 16: "\x{5CF6}"
- RenderText {#text} at (18,337) size 16x18
- text run at (18,337) width 16: "\x{FF5C}"
+ RenderText {#text} at (18,313) size 48x40
+ text run at (18,313) width 32: "\x{9E7F}\x{5150}"
+ text run at (2,335) width 16: "\x{5CF6}"
+ RenderText {#text} at (18,335) size 16x18
+ text run at (18,335) width 16: "\x{FF5C}"
Modified: trunk/LayoutTests/platform/mac-bigsur/fast/text/capitalize-boundaries-expected.txt (282871 => 282872)
--- trunk/LayoutTests/platform/mac-bigsur/fast/text/capitalize-boundaries-expected.txt 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/platform/mac-bigsur/fast/text/capitalize-boundaries-expected.txt 2021-09-22 13:25:48 UTC (rev 282872)
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x1201
+layer at (0,0) size 785x1199
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1201
- RenderBlock {HTML} at (0,0) size 785x1201
- RenderBody {BODY} at (8,8) size 769x1185
+layer at (0,0) size 785x1199
+ RenderBlock {HTML} at (0,0) size 785x1199
+ RenderBody {BODY} at (8,8) size 769x1183
RenderBlock (anonymous) at (0,0) size 769x90
RenderText {#text} at (0,0) size 352x18
text run at (0,0) width 352: "This test was provided by open-source contributors on "
@@ -86,47 +86,47 @@
RenderText {#text} at (20,1) size 14x20
text run at (20,2) width 14: "fr"
RenderTableCell {TD} at (57,197) size 710x27 [border: (1px solid #EEEEEE)] [r=5 c=1 rs=1 cs=1]
- RenderText {#text} at (2,7) size 215x18
- text run at (2,7) width 215: "quelqu'un l\x{2019}amour t'appelles\x{2011}tu 3"
+ RenderText {#text} at (2,6) size 215x18
+ text run at (2,6) width 215: "quelqu'un l\x{2019}amour t'appelles\x{2011}tu 3"
RenderInline {SUP} at (0,0) size 23x15
RenderText {#text} at (216,2) size 23x15
text run at (216,2) width 23: "eme"
- RenderTableRow {TR} at (0,226) size 769x23
- RenderTableCell {TH} at (2,226) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,225) size 769x24
+ RenderTableCell {TH} at (2,225) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
RenderText {#text} at (17,1) size 19x20
text run at (17,2) width 19: "hu"
- RenderTableCell {TD} at (57,226) size 710x23 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,225) size 710x24 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
RenderText {#text} at (2,3) size 114x18
text run at (2,3) width 114: "11-ei london\x{2011}ban"
- RenderTableRow {TR} at (0,251) size 769x22
- RenderTableCell {TH} at (2,251) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,250) size 769x23
+ RenderTableCell {TH} at (2,250) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "nl"
- RenderTableCell {TD} at (57,251) size 710x22 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,250) size 710x23 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 70x18
text run at (2,2) width 70: "'s ochtends"
- RenderTableRow {TR} at (0,275) size 769x22
- RenderTableCell {TH} at (2,275) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,274) size 769x23
+ RenderTableCell {TH} at (2,274) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "pl"
- RenderTableCell {TD} at (57,275) size 710x22 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,274) size 710x23 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 94x18
text run at (2,2) width 94: "wzi\x{119}\x{142}a bie\x{17C}\x{105}ce"
- RenderTableRow {TR} at (0,299) size 769x22
- RenderTableCell {TH} at (2,299) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,298) size 769x23
+ RenderTableCell {TH} at (2,298) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
RenderText {#text} at (18,2) size 17x18
text run at (18,2) width 17: "ru"
- RenderTableCell {TD} at (57,299) size 710x22 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,298) size 710x23 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 194x18
text run at (2,2) width 194: "\x{43D}\x{44C}\x{44E}-\x{439}\x{43E}\x{440}\x{43A} 1990-\x{445} 14-vii-1789"
- RenderTableRow {TR} at (0,323) size 769x22
- RenderTableCell {TH} at (2,323) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,322) size 769x23
+ RenderTableCell {TH} at (2,322) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
RenderText {#text} at (17,2) size 20x18
text run at (17,2) width 20: "tlh"
- RenderTableCell {TD} at (57,323) size 710x22 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,322) size 710x23 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 189x18
text run at (2,2) width 189: "tlhIngan Hol wa''uy' loghqam"
- RenderTable {TABLE} at (0,455) size 769x365
+ RenderTable {TABLE} at (0,454) size 769x365
RenderBlock {CAPTION} at (0,0) size 769x18
RenderText {#text} at (313,0) size 143x18
text run at (313,0) width 143: "Correct output sample"
@@ -179,47 +179,47 @@
RenderText {#text} at (20,1) size 14x20
text run at (20,2) width 14: "fr"
RenderTableCell {TD} at (57,197) size 710x27 [border: (1px solid #EEEEEE)] [r=5 c=1 rs=1 cs=1]
- RenderText {#text} at (2,7) size 232x18
- text run at (2,7) width 232: "Quelqu'un l\x{2019}Amour t'Appelles\x{2011}Tu 3"
+ RenderText {#text} at (2,6) size 232x18
+ text run at (2,6) width 232: "Quelqu'un l\x{2019}Amour t'Appelles\x{2011}Tu 3"
RenderInline {SUP} at (0,0) size 23x15
RenderText {#text} at (233,2) size 23x15
text run at (233,2) width 23: "eme"
- RenderTableRow {TR} at (0,226) size 769x23
- RenderTableCell {TH} at (2,226) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,225) size 769x24
+ RenderTableCell {TH} at (2,225) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
RenderText {#text} at (17,1) size 19x20
text run at (17,2) width 19: "hu"
- RenderTableCell {TD} at (57,226) size 710x23 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,225) size 710x24 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
RenderText {#text} at (2,3) size 119x18
text run at (2,3) width 119: "11-ei London\x{2011}ban"
- RenderTableRow {TR} at (0,251) size 769x22
- RenderTableCell {TH} at (2,251) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,250) size 769x23
+ RenderTableCell {TH} at (2,250) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "nl"
- RenderTableCell {TD} at (57,251) size 710x22 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,250) size 710x23 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 74x18
text run at (2,2) width 74: "'s Ochtends"
- RenderTableRow {TR} at (0,275) size 769x22
- RenderTableCell {TH} at (2,275) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,274) size 769x23
+ RenderTableCell {TH} at (2,274) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "pl"
- RenderTableCell {TD} at (57,275) size 710x22 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,274) size 710x23 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 100x18
text run at (2,2) width 100: "Wzi\x{119}\x{142}a Bie\x{17C}\x{105}ce"
- RenderTableRow {TR} at (0,299) size 769x22
- RenderTableCell {TH} at (2,299) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,298) size 769x23
+ RenderTableCell {TH} at (2,298) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
RenderText {#text} at (18,2) size 17x18
text run at (18,2) width 17: "ru"
- RenderTableCell {TD} at (57,299) size 710x22 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,298) size 710x23 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 201x18
text run at (2,2) width 201: "\x{41D}\x{44C}\x{44E}-\x{419}\x{43E}\x{440}\x{43A} 1990-\x{445} 14-vii-1789"
- RenderTableRow {TR} at (0,323) size 769x22
- RenderTableCell {TH} at (2,323) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,322) size 769x23
+ RenderTableCell {TH} at (2,322) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
RenderText {#text} at (17,2) size 20x18
text run at (17,2) width 20: "tlh"
- RenderTableCell {TD} at (57,323) size 710x22 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,322) size 710x23 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 189x18
text run at (2,2) width 189: "tlhIngan Hol wa''uy' loghqam"
- RenderTable {TABLE} at (0,820) size 769x365
+ RenderTable {TABLE} at (0,818) size 769x365
RenderBlock {CAPTION} at (0,0) size 769x18
RenderText {#text} at (324,0) size 121x18
text run at (324,0) width 121: "Browser rendering"
@@ -288,43 +288,43 @@
RenderText {#text} at (20,1) size 14x20
text run at (20,2) width 14: "fr"
RenderTableCell {TD} at (57,197) size 710x27 [border: (1px solid #EEEEEE)] [r=5 c=1 rs=1 cs=1]
- RenderText {#text} at (2,7) size 233x18
- text run at (2,7) width 233: "Quelqu'un L\x{2019}amour T'appelles\x{2011}Tu 3"
+ RenderText {#text} at (2,6) size 233x18
+ text run at (2,6) width 233: "Quelqu'un L\x{2019}amour T'appelles\x{2011}Tu 3"
RenderInline {SUP} at (0,0) size 22x15
RenderText {#text} at (234,2) size 22x15
text run at (234,2) width 22: "eme"
- RenderTableRow {TR} at (0,226) size 769x23
- RenderTableCell {TH} at (2,226) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,225) size 769x24
+ RenderTableCell {TH} at (2,225) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
RenderText {#text} at (17,1) size 19x20
text run at (17,2) width 19: "hu"
- RenderTableCell {TD} at (57,226) size 710x23 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,225) size 710x24 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
RenderText {#text} at (2,3) size 124x18
text run at (2,3) width 124: "11-Ei London\x{2011}Ban"
- RenderTableRow {TR} at (0,251) size 769x22
- RenderTableCell {TH} at (2,251) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,250) size 769x23
+ RenderTableCell {TH} at (2,250) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "nl"
- RenderTableCell {TD} at (57,251) size 710x22 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,250) size 710x23 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 77x18
text run at (2,2) width 77: "'S Ochtends"
- RenderTableRow {TR} at (0,275) size 769x22
- RenderTableCell {TH} at (2,275) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,274) size 769x23
+ RenderTableCell {TH} at (2,274) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "pl"
- RenderTableCell {TD} at (57,275) size 710x22 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,274) size 710x23 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 100x18
text run at (2,2) width 100: "Wzi\x{119}\x{142}a Bie\x{17C}\x{105}ce"
- RenderTableRow {TR} at (0,299) size 769x22
- RenderTableCell {TH} at (2,299) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,298) size 769x23
+ RenderTableCell {TH} at (2,298) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
RenderText {#text} at (18,2) size 17x18
text run at (18,2) width 17: "ru"
- RenderTableCell {TD} at (57,299) size 710x22 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,298) size 710x23 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 207x18
text run at (2,2) width 207: "\x{41D}\x{44C}\x{44E}-\x{419}\x{43E}\x{440}\x{43A} 1990-\x{425} 14-Vii-1789"
- RenderTableRow {TR} at (0,323) size 769x22
- RenderTableCell {TH} at (2,323) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,322) size 769x23
+ RenderTableCell {TH} at (2,322) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
RenderText {#text} at (17,2) size 20x18
text run at (17,2) width 20: "tlh"
- RenderTableCell {TD} at (57,323) size 710x22 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,322) size 710x23 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 206x18
text run at (2,2) width 206: "TlhIngan Hol Wa''Uy' Loghqam"
Modified: trunk/LayoutTests/platform/mac-catalina/fast/text/capitalize-boundaries-expected.txt (282871 => 282872)
--- trunk/LayoutTests/platform/mac-catalina/fast/text/capitalize-boundaries-expected.txt 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/LayoutTests/platform/mac-catalina/fast/text/capitalize-boundaries-expected.txt 2021-09-22 13:25:48 UTC (rev 282872)
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x1201
+layer at (0,0) size 785x1199
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1201
- RenderBlock {HTML} at (0,0) size 785x1201
- RenderBody {BODY} at (8,8) size 769x1185
+layer at (0,0) size 785x1199
+ RenderBlock {HTML} at (0,0) size 785x1199
+ RenderBody {BODY} at (8,8) size 769x1183
RenderBlock (anonymous) at (0,0) size 769x90
RenderText {#text} at (0,0) size 352x18
text run at (0,0) width 352: "This test was provided by open-source contributors on "
@@ -86,47 +86,47 @@
RenderText {#text} at (20,1) size 14x20
text run at (20,2) width 14: "fr"
RenderTableCell {TD} at (57,197) size 710x27 [border: (1px solid #EEEEEE)] [r=5 c=1 rs=1 cs=1]
- RenderText {#text} at (2,7) size 215x18
- text run at (2,7) width 215: "quelqu'un l\x{2019}amour t'appelles\x{2011}tu 3"
+ RenderText {#text} at (2,6) size 215x18
+ text run at (2,6) width 215: "quelqu'un l\x{2019}amour t'appelles\x{2011}tu 3"
RenderInline {SUP} at (0,0) size 23x15
RenderText {#text} at (216,2) size 23x15
text run at (216,2) width 23: "eme"
- RenderTableRow {TR} at (0,226) size 769x23
- RenderTableCell {TH} at (2,226) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,225) size 769x24
+ RenderTableCell {TH} at (2,225) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
RenderText {#text} at (17,1) size 19x20
text run at (17,2) width 19: "hu"
- RenderTableCell {TD} at (57,226) size 710x23 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,225) size 710x24 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
RenderText {#text} at (2,3) size 114x18
text run at (2,3) width 114: "11-ei london\x{2011}ban"
- RenderTableRow {TR} at (0,251) size 769x22
- RenderTableCell {TH} at (2,251) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,250) size 769x23
+ RenderTableCell {TH} at (2,250) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "nl"
- RenderTableCell {TD} at (57,251) size 710x22 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,250) size 710x23 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 70x18
text run at (2,2) width 70: "'s ochtends"
- RenderTableRow {TR} at (0,275) size 769x22
- RenderTableCell {TH} at (2,275) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,274) size 769x23
+ RenderTableCell {TH} at (2,274) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "pl"
- RenderTableCell {TD} at (57,275) size 710x22 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,274) size 710x23 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 94x18
text run at (2,2) width 94: "wzi\x{119}\x{142}a bie\x{17C}\x{105}ce"
- RenderTableRow {TR} at (0,299) size 769x22
- RenderTableCell {TH} at (2,299) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,298) size 769x23
+ RenderTableCell {TH} at (2,298) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
RenderText {#text} at (18,2) size 17x18
text run at (18,2) width 17: "ru"
- RenderTableCell {TD} at (57,299) size 710x22 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,298) size 710x23 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 194x18
text run at (2,2) width 194: "\x{43D}\x{44C}\x{44E}-\x{439}\x{43E}\x{440}\x{43A} 1990-\x{445} 14-vii-1789"
- RenderTableRow {TR} at (0,323) size 769x22
- RenderTableCell {TH} at (2,323) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,322) size 769x23
+ RenderTableCell {TH} at (2,322) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
RenderText {#text} at (17,2) size 20x18
text run at (17,2) width 20: "tlh"
- RenderTableCell {TD} at (57,323) size 710x22 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,322) size 710x23 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 189x18
text run at (2,2) width 189: "tlhIngan Hol wa''uy' loghqam"
- RenderTable {TABLE} at (0,455) size 769x365
+ RenderTable {TABLE} at (0,454) size 769x365
RenderBlock {CAPTION} at (0,0) size 769x18
RenderText {#text} at (313,0) size 143x18
text run at (313,0) width 143: "Correct output sample"
@@ -179,47 +179,47 @@
RenderText {#text} at (20,1) size 14x20
text run at (20,2) width 14: "fr"
RenderTableCell {TD} at (57,197) size 710x27 [border: (1px solid #EEEEEE)] [r=5 c=1 rs=1 cs=1]
- RenderText {#text} at (2,7) size 232x18
- text run at (2,7) width 232: "Quelqu'un l\x{2019}Amour t'Appelles\x{2011}Tu 3"
+ RenderText {#text} at (2,6) size 232x18
+ text run at (2,6) width 232: "Quelqu'un l\x{2019}Amour t'Appelles\x{2011}Tu 3"
RenderInline {SUP} at (0,0) size 23x15
RenderText {#text} at (233,2) size 23x15
text run at (233,2) width 23: "eme"
- RenderTableRow {TR} at (0,226) size 769x23
- RenderTableCell {TH} at (2,226) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,225) size 769x24
+ RenderTableCell {TH} at (2,225) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
RenderText {#text} at (17,1) size 19x20
text run at (17,2) width 19: "hu"
- RenderTableCell {TD} at (57,226) size 710x23 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,225) size 710x24 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
RenderText {#text} at (2,3) size 119x18
text run at (2,3) width 119: "11-ei London\x{2011}ban"
- RenderTableRow {TR} at (0,251) size 769x22
- RenderTableCell {TH} at (2,251) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,250) size 769x23
+ RenderTableCell {TH} at (2,250) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "nl"
- RenderTableCell {TD} at (57,251) size 710x22 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,250) size 710x23 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 74x18
text run at (2,2) width 74: "'s Ochtends"
- RenderTableRow {TR} at (0,275) size 769x22
- RenderTableCell {TH} at (2,275) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,274) size 769x23
+ RenderTableCell {TH} at (2,274) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "pl"
- RenderTableCell {TD} at (57,275) size 710x22 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,274) size 710x23 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 100x18
text run at (2,2) width 100: "Wzi\x{119}\x{142}a Bie\x{17C}\x{105}ce"
- RenderTableRow {TR} at (0,299) size 769x22
- RenderTableCell {TH} at (2,299) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,298) size 769x23
+ RenderTableCell {TH} at (2,298) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
RenderText {#text} at (18,2) size 17x18
text run at (18,2) width 17: "ru"
- RenderTableCell {TD} at (57,299) size 710x22 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,298) size 710x23 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 201x18
text run at (2,2) width 201: "\x{41D}\x{44C}\x{44E}-\x{419}\x{43E}\x{440}\x{43A} 1990-\x{445} 14-vii-1789"
- RenderTableRow {TR} at (0,323) size 769x22
- RenderTableCell {TH} at (2,323) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,322) size 769x23
+ RenderTableCell {TH} at (2,322) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
RenderText {#text} at (17,2) size 20x18
text run at (17,2) width 20: "tlh"
- RenderTableCell {TD} at (57,323) size 710x22 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,322) size 710x23 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 189x18
text run at (2,2) width 189: "tlhIngan Hol wa''uy' loghqam"
- RenderTable {TABLE} at (0,820) size 769x365
+ RenderTable {TABLE} at (0,818) size 769x365
RenderBlock {CAPTION} at (0,0) size 769x18
RenderText {#text} at (324,0) size 121x18
text run at (324,0) width 121: "Browser rendering"
@@ -288,43 +288,43 @@
RenderText {#text} at (20,1) size 14x20
text run at (20,2) width 14: "fr"
RenderTableCell {TD} at (57,197) size 710x27 [border: (1px solid #EEEEEE)] [r=5 c=1 rs=1 cs=1]
- RenderText {#text} at (2,7) size 233x18
- text run at (2,7) width 233: "Quelqu'un L\x{2019}amour T'appelles\x{2011}Tu 3"
+ RenderText {#text} at (2,6) size 233x18
+ text run at (2,6) width 233: "Quelqu'un L\x{2019}amour T'appelles\x{2011}Tu 3"
RenderInline {SUP} at (0,0) size 22x15
RenderText {#text} at (234,2) size 22x15
text run at (234,2) width 22: "eme"
- RenderTableRow {TR} at (0,226) size 769x23
- RenderTableCell {TH} at (2,226) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,225) size 769x24
+ RenderTableCell {TH} at (2,225) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=6 c=0 rs=1 cs=1]
RenderText {#text} at (17,1) size 19x20
text run at (17,2) width 19: "hu"
- RenderTableCell {TD} at (57,226) size 710x23 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,225) size 710x24 [border: (1px solid #EEEEEE)] [r=6 c=1 rs=1 cs=1]
RenderText {#text} at (2,3) size 124x18
text run at (2,3) width 124: "11-Ei London\x{2011}Ban"
- RenderTableRow {TR} at (0,251) size 769x22
- RenderTableCell {TH} at (2,251) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,250) size 769x23
+ RenderTableCell {TH} at (2,250) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=7 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "nl"
- RenderTableCell {TD} at (57,251) size 710x22 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,250) size 710x23 [border: (1px solid #EEEEEE)] [r=7 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 77x18
text run at (2,2) width 77: "'S Ochtends"
- RenderTableRow {TR} at (0,275) size 769x22
- RenderTableCell {TH} at (2,275) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,274) size 769x23
+ RenderTableCell {TH} at (2,274) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=8 c=0 rs=1 cs=1]
RenderText {#text} at (20,2) size 14x18
text run at (20,2) width 14: "pl"
- RenderTableCell {TD} at (57,275) size 710x22 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,274) size 710x23 [border: (1px solid #EEEEEE)] [r=8 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 100x18
text run at (2,2) width 100: "Wzi\x{119}\x{142}a Bie\x{17C}\x{105}ce"
- RenderTableRow {TR} at (0,299) size 769x22
- RenderTableCell {TH} at (2,299) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,298) size 769x23
+ RenderTableCell {TH} at (2,298) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=9 c=0 rs=1 cs=1]
RenderText {#text} at (18,2) size 17x18
text run at (18,2) width 17: "ru"
- RenderTableCell {TD} at (57,299) size 710x22 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,298) size 710x23 [border: (1px solid #EEEEEE)] [r=9 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 207x18
text run at (2,2) width 207: "\x{41D}\x{44C}\x{44E}-\x{419}\x{43E}\x{440}\x{43A} 1990-\x{425} 14-Vii-1789"
- RenderTableRow {TR} at (0,323) size 769x22
- RenderTableCell {TH} at (2,323) size 54x22 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,322) size 769x23
+ RenderTableCell {TH} at (2,322) size 54x23 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=10 c=0 rs=1 cs=1]
RenderText {#text} at (17,2) size 20x18
text run at (17,2) width 20: "tlh"
- RenderTableCell {TD} at (57,323) size 710x22 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (57,322) size 710x23 [border: (1px solid #EEEEEE)] [r=10 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 206x18
text run at (2,2) width 206: "TlhIngan Hol Wa''Uy' Loghqam"
Modified: trunk/Source/WebCore/ChangeLog (282871 => 282872)
--- trunk/Source/WebCore/ChangeLog 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/Source/WebCore/ChangeLog 2021-09-22 13:25:48 UTC (rev 282872)
@@ -1,3 +1,17 @@
+2021-09-22 Alan Bujtas <za...@apple.com>
+
+ [LFC][IFC] Add fallback font support
+ https://bugs.webkit.org/show_bug.cgi?id=228685
+ <rdar://problem/81661514>
+
+ Reviewed by Antti Koivisto.
+
+ * layout/integration/LayoutIntegrationCoverage.cpp:
+ (WebCore::LayoutIntegration::printReason):
+ (WebCore::LayoutIntegration::canUseForText):
+ (WebCore::LayoutIntegration::canUseForFontAndText):
+ * layout/integration/LayoutIntegrationCoverage.h:
+
2021-09-22 Antti Koivisto <an...@apple.com>
[LFC][Integration] Remove ALLOW_ coverage defines
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (282871 => 282872)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-09-22 13:25:48 UTC (rev 282872)
@@ -161,9 +161,6 @@
case AvoidanceReason::FlowIsMissingPrimaryFont:
stream << "missing primary font";
break;
- case AvoidanceReason::FlowPrimaryFontIsInsufficient:
- stream << "missing glyph or glyph needs another font";
- break;
case AvoidanceReason::FlowTextIsCombineText:
stream << "text is combine";
break;
@@ -381,41 +378,27 @@
}
#endif
-static OptionSet<AvoidanceReason> canUseForText(StringView text, const FontCascade& fontCascade, IncludeReasons includeReasons)
+static OptionSet<AvoidanceReason> canUseForText(StringView text, IncludeReasons includeReasons)
{
+ if (text.is8Bit())
+ return { };
+
OptionSet<AvoidanceReason> reasons;
- auto& primaryFont = fontCascade.primaryFont();
auto length = text.length();
+ size_t position = 0;
+ while (position < length) {
+ UChar32 character;
+ U16_NEXT(text.characters16(), position, length, character);
- auto glpyhIsInPrimaryFont = [&](auto character) {
- auto glyphData = fontCascade.glyphDataForCharacter(character, false);
- return glyphData.isValid() && glyphData.font == &primaryFont;
- };
-
- if (text.is8Bit()) {
- for (size_t i = 0; i < length; ++i) {
- if (!glpyhIsInPrimaryFont(text[i]))
- SET_REASON_AND_RETURN_IF_NEEDED(FlowPrimaryFontIsInsufficient, reasons, includeReasons);
- }
- } else {
- size_t position = 0;
- while (position < length) {
- UChar32 character;
- U16_NEXT(text.characters16(), position, length, character);
-
- if (!glpyhIsInPrimaryFont(character))
- SET_REASON_AND_RETURN_IF_NEEDED(FlowPrimaryFontIsInsufficient, reasons, includeReasons);
-
- auto isRTLDirectional = [&](auto character) {
- auto direction = u_charDirection(character);
- return direction == U_RIGHT_TO_LEFT || direction == U_RIGHT_TO_LEFT_ARABIC
- || direction == U_RIGHT_TO_LEFT_EMBEDDING || direction == U_RIGHT_TO_LEFT_OVERRIDE
- || direction == U_LEFT_TO_RIGHT_EMBEDDING || direction == U_LEFT_TO_RIGHT_OVERRIDE
- || direction == U_POP_DIRECTIONAL_FORMAT || direction == U_BOUNDARY_NEUTRAL;
- };
- if (isRTLDirectional(character))
- SET_REASON_AND_RETURN_IF_NEEDED(FlowTextHasDirectionCharacter, reasons, includeReasons);
- }
+ auto isRTLDirectional = [&](auto character) {
+ auto direction = u_charDirection(character);
+ return direction == U_RIGHT_TO_LEFT || direction == U_RIGHT_TO_LEFT_ARABIC
+ || direction == U_RIGHT_TO_LEFT_EMBEDDING || direction == U_RIGHT_TO_LEFT_OVERRIDE
+ || direction == U_LEFT_TO_RIGHT_EMBEDDING || direction == U_LEFT_TO_RIGHT_OVERRIDE
+ || direction == U_POP_DIRECTIONAL_FORMAT || direction == U_BOUNDARY_NEUTRAL;
+ };
+ if (isRTLDirectional(character))
+ SET_REASON_AND_RETURN_IF_NEEDED(FlowTextHasDirectionCharacter, reasons, includeReasons);
}
return { };
}
@@ -452,7 +435,7 @@
SET_REASON_AND_RETURN_IF_NEEDED(FlowHasComplexFontCodePath, reasons, includeReasons);
}
- auto textReasons = canUseForText(textRenderer.stringView(), fontCascade, includeReasons);
+ auto textReasons = canUseForText(textRenderer.stringView(), includeReasons);
if (textReasons)
ADD_REASONS_AND_RETURN_IF_NEEDED(textReasons, reasons, includeReasons);
}
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h (282871 => 282872)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h 2021-09-22 13:22:29 UTC (rev 282871)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h 2021-09-22 13:25:48 UTC (rev 282872)
@@ -71,7 +71,7 @@
FlowHasSVGFont = 1LLU << 31,
FlowTextHasDirectionCharacter = 1LLU << 32,
FlowIsMissingPrimaryFont = 1LLU << 33,
- FlowPrimaryFontIsInsufficient = 1LLU << 34,
+ // Unused = 1LLU << 34,
FlowTextIsCombineText = 1LLU << 35,
FlowTextIsRenderCounter = 1LLU << 36,
FlowTextIsRenderQuote = 1LLU << 37,
