Diff
Modified: branches/safari-605-branch/LayoutTests/ChangeLog (228189 => 228190)
--- branches/safari-605-branch/LayoutTests/ChangeLog 2018-02-06 21:45:21 UTC (rev 228189)
+++ branches/safari-605-branch/LayoutTests/ChangeLog 2018-02-06 22:00:27 UTC (rev 228190)
@@ -1,5 +1,9 @@
2018-02-06 Jason Marcell <jmarc...@apple.com>
+ Revert r228147. rdar://problem/37264529
+
+2018-02-06 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r228150. rdar://problem/37264467
2018-02-05 Youenn Fablet <you...@apple.com>
Modified: branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-basic-expected.txt (228189 => 228190)
--- branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-basic-expected.txt 2018-02-06 21:45:21 UTC (rev 228189)
+++ branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-basic-expected.txt 2018-02-06 22:00:27 UTC (rev 228190)
@@ -4,24 +4,24 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,16) size 784x568
RenderBlock {DIV} at (16,0) size 400x100
- RenderBlock (floating) at (2,4) size 56x53
- RenderText at (0,-18) size 56x86
- text run at (0,-18) width 56: "A"
- RenderText {#text} at (59,0) size 399x99
- text run at (59,0) width 317: "n example of first-letter. This letter should span 3"
- text run at (59,20) width 340: "lines of text, and so it should align itself cleanly with"
- text run at (59,40) width 337: "the cap-height of the A lining up with the cap-height"
+ RenderBlock (floating) at (2,4) size 48x53
+ RenderText at (0,-25) size 48x96
+ text run at (0,-25) width 48: "A"
+ RenderText {#text} at (51,0) size 391x99
+ text run at (51,0) width 317: "n example of first-letter. This letter should span 3"
+ text run at (51,20) width 340: "lines of text, and so it should align itself cleanly with"
+ text run at (51,40) width 336: "the cap-height of the A lining up with the cap-height"
text run at (0,60) width 379: "of the first line, and the baseline of the A lining up with the"
text run at (0,80) width 160: "baseline of the third line."
RenderBlock {SPAN} at (0,116) size 784x100
RenderBlock {DIV} at (368,0) size 400x100
- RenderBlock (floating) at (342,4) size 56x53
- RenderText at (0,-18) size 56x86
- text run at (0,-18) width 56: "A"
- RenderText {#text} at (3,0) size 400x99
- text run at (3,0) width 338: "n RTL example of first-letter. This letter should span"
- text run at (21,20) width 320: "3 lines of text, and so it should align itself cleanly"
- text run at (12,40) width 329: "with the cap-height of the A lining up with the cap-"
- text run at (0,60) width 400: "height of the first line, and the baseline of the A lining up with"
- text run at (216,80) width 5 RTL: "."
- text run at (220,80) width 180: "the baseline of the third line"
+ RenderBlock (floating) at (350,4) size 48x53
+ RenderText at (0,-25) size 48x96
+ text run at (0,-25) width 48: "A"
+ RenderText {#text} at (0,0) size 400x99
+ text run at (0,0) width 349: "n RTL example of first-letter. This letter should span 3"
+ text run at (9,20) width 340: "lines of text, and so it should align itself cleanly with"
+ text run at (13,40) width 336: "the cap-height of the A lining up with the cap-height"
+ text run at (21,60) width 379: "of the first line, and the baseline of the A lining up with the"
+ text run at (240,80) width 5 RTL: "."
+ text run at (244,80) width 156: "baseline of the third line"
Modified: branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-border-padding-expected.txt (228189 => 228190)
--- branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-border-padding-expected.txt 2018-02-06 21:45:21 UTC (rev 228189)
+++ branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-border-padding-expected.txt 2018-02-06 22:00:27 UTC (rev 228190)
@@ -4,24 +4,24 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,16) size 784x568
RenderBlock {DIV} at (16,0) size 400x120
- RenderBlock (floating) at (2,1) size 62x59 [color=#FF0000] [border: (2px solid #FF0000)]
- RenderText at (3,-15) size 56x86
- text run at (3,-15) width 56: "A"
- RenderText {#text} at (65,20) size 386x99
- text run at (65,20) width 317: "n example of first-letter. This letter should span 3"
- text run at (65,40) width 308: "lines of text, and so it should align itself cleanly"
- text run at (0,60) width 386: "with the cap-height of the A lining up with the cap-height of"
- text run at (0,80) width 362: "the first line, and the baseline of the A lining up with the"
- text run at (0,100) width 160: "baseline of the third line."
+ RenderBlock (floating) at (2,1) size 54x59 [color=#FF0000] [border: (2px solid #FF0000)]
+ RenderText at (3,-22) size 48x96
+ text run at (3,-22) width 48: "A"
+ RenderText {#text} at (57,20) size 397x99
+ text run at (57,20) width 317: "n example of first-letter. This letter should span 3"
+ text run at (57,40) width 340: "lines of text, and so it should align itself cleanly with"
+ text run at (0,60) width 377: "the cap-height of the A lining up with the cap-height of the"
+ text run at (0,80) width 395: "first line, and the baseline of the A lining up with the baseline"
+ text run at (0,100) width 104: "of the third line."
RenderBlock {SPAN} at (0,136) size 784x120
RenderBlock {DIV} at (368,0) size 400x120
- RenderBlock (floating) at (336,1) size 62x59 [color=#FF0000] [border: (2px solid #FF0000)]
- RenderText at (3,-15) size 56x86
- text run at (3,-15) width 56: "A"
- RenderText {#text} at (31,20) size 400x99
- text run at (31,20) width 304: "n RTL example of first-letter. This letter should"
- text run at (32,40) width 303: "span 3 lines of text, and so it should align itself"
- text run at (21,60) width 379: "cleanly with the cap-height of the A lining up with the cap-"
- text run at (0,80) width 400: "height of the first line, and the baseline of the A lining up with"
- text run at (216,100) width 5 RTL: "."
- text run at (220,100) width 180: "the baseline of the third line"
+ RenderBlock (floating) at (344,1) size 54x59 [color=#FF0000] [border: (2px solid #FF0000)]
+ RenderText at (3,-22) size 48x96
+ text run at (3,-22) width 48: "A"
+ RenderText {#text} at (6,20) size 394x99
+ text run at (6,20) width 337: "n RTL example of first-letter. This letter should span"
+ text run at (24,40) width 319: "3 lines of text, and so it should align itself cleanly"
+ text run at (14,60) width 386: "with the cap-height of the A lining up with the cap-height of"
+ text run at (38,80) width 362: "the first line, and the baseline of the A lining up with the"
+ text run at (240,100) width 5 RTL: "."
+ text run at (244,100) width 156: "baseline of the third line"
Modified: branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-raised-expected.txt (228189 => 228190)
--- branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-raised-expected.txt 2018-02-06 21:45:21 UTC (rev 228189)
+++ branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-raised-expected.txt 2018-02-06 22:00:27 UTC (rev 228190)
@@ -4,24 +4,24 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,16) size 784x568
RenderBlock {DIV} at (16,0) size 400x120
- RenderBlock (floating) at (2,4) size 56x53
- RenderText at (0,-18) size 56x86
- text run at (0,-18) width 56: "A"
- RenderText {#text} at (59,20) size 399x99
- text run at (59,20) width 317: "n example of first-letter. This letter should span 3"
- text run at (59,40) width 340: "lines of text, and so it should align itself cleanly with"
+ RenderBlock (floating) at (2,4) size 48x53
+ RenderText at (0,-25) size 48x96
+ text run at (0,-25) width 48: "A"
+ RenderText {#text} at (51,20) size 395x99
+ text run at (51,20) width 317: "n example of first-letter. This letter should span 3"
+ text run at (51,40) width 340: "lines of text, and so it should align itself cleanly with"
text run at (0,60) width 377: "the cap-height of the A lining up with the cap-height of the"
text run at (0,80) width 395: "first line, and the baseline of the A lining up with the baseline"
text run at (0,100) width 104: "of the third line."
RenderBlock {SPAN} at (0,136) size 784x120
RenderBlock {DIV} at (368,0) size 400x120
- RenderBlock (floating) at (342,4) size 56x53
- RenderText at (0,-18) size 56x86
- text run at (0,-18) width 56: "A"
- RenderText {#text} at (3,20) size 397x99
- text run at (3,20) width 338: "n RTL example of first-letter. This letter should span"
- text run at (21,40) width 320: "3 lines of text, and so it should align itself cleanly"
- text run at (14,60) width 386: "with the cap-height of the A lining up with the cap-height of"
- text run at (38,80) width 362: "the first line, and the baseline of the A lining up with the"
- text run at (240,100) width 5 RTL: "."
- text run at (244,100) width 156: "baseline of the third line"
+ RenderBlock (floating) at (350,4) size 48x53
+ RenderText at (0,-25) size 48x96
+ text run at (0,-25) width 48: "A"
+ RenderText {#text} at (0,20) size 400x99
+ text run at (0,20) width 349: "n RTL example of first-letter. This letter should span 3"
+ text run at (9,40) width 340: "lines of text, and so it should align itself cleanly with"
+ text run at (23,60) width 377: "the cap-height of the A lining up with the cap-height of the"
+ text run at (5,80) width 395: "first line, and the baseline of the A lining up with the baseline"
+ text run at (296,100) width 5 RTL: "."
+ text run at (300,100) width 100: "of the third line"
Modified: branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-sunken-expected.txt (228189 => 228190)
--- branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-sunken-expected.txt 2018-02-06 21:45:21 UTC (rev 228189)
+++ branches/safari-605-branch/LayoutTests/platform/ios/fast/css-generated-content/initial-letter-sunken-expected.txt 2018-02-06 22:00:27 UTC (rev 228190)
@@ -4,24 +4,24 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,16) size 784x568
RenderBlock {DIV} at (16,0) size 400x100
- RenderBlock (floating) at (2,24) size 34x33
- RenderText at (0,-11) size 34x53
- text run at (0,-11) width 34: "A"
- RenderText {#text} at (37,0) size 398x99
- text run at (37,0) width 352: "n example of first-letter. This letter should span 3 lines"
- text run at (37,20) width 361: "of text, and so it should align itself cleanly with the cap-"
- text run at (37,40) width 356: "height of the A lining up with the cap-height of the first"
+ RenderBlock (floating) at (2,24) size 29x33
+ RenderText at (0,-15) size 29x58
+ text run at (0,-15) width 29: "A"
+ RenderText {#text} at (32,0) size 393x99
+ text run at (32,0) width 351: "n example of first-letter. This letter should span 3 lines"
+ text run at (32,20) width 361: "of text, and so it should align itself cleanly with the cap-"
+ text run at (32,40) width 356: "height of the A lining up with the cap-height of the first"
text run at (0,60) width 382: "line, and the baseline of the A lining up with the baseline of"
text run at (0,80) width 86: "the third line."
RenderBlock {SPAN} at (0,116) size 784x100
RenderBlock {DIV} at (368,0) size 400x100
- RenderBlock (floating) at (364,24) size 34x33
- RenderText at (0,-11) size 34x53
- text run at (0,-11) width 34: "A"
- RenderText {#text} at (13,0) size 391x99
- text run at (13,0) width 350: "n RTL example of first-letter. This letter should span 3"
- text run at (22,20) width 341: "lines of text, and so it should align itself cleanly with"
- text run at (9,40) width 354: "the cap-height of the A lining up with the cap-height of"
- text run at (38,60) width 362: "the first line, and the baseline of the A lining up with the"
- text run at (240,80) width 5 RTL: "."
- text run at (244,80) width 156: "baseline of the third line"
+ RenderBlock (floating) at (369,24) size 29x33
+ RenderText at (0,-15) size 29x58
+ text run at (0,-15) width 29: "A"
+ RenderText {#text} at (18,0) size 396x99
+ text run at (18,0) width 350: "n RTL example of first-letter. This letter should span 3"
+ text run at (4,20) width 364: "lines of text, and so it should align itself cleanly with the"
+ text run at (14,40) width 354: "cap-height of the A lining up with the cap-height of the"
+ text run at (5,60) width 395: "first line, and the baseline of the A lining up with the baseline"
+ text run at (296,80) width 5 RTL: "."
+ text run at (300,80) width 100: "of the third line"
