Changeset 255117 in webkit
- Timestamp:
- Jan 25, 2020 6:16:30 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 16 edited
-
LayoutTests/ChangeLog (modified) (1 diff)
-
LayoutTests/fast/dom/Range/getBoundingClientRect-expected.txt (modified) (1 diff)
-
LayoutTests/platform/ios/fast/text/hyphenate-limit-lines-expected.txt (modified) (3 diffs)
-
LayoutTests/platform/ios/fast/text/whitespace/pre-break-word-expected.txt (modified) (1 diff)
-
LayoutTests/platform/ios/fast/text/word-break-expected.txt (modified) (7 diffs)
-
LayoutTests/platform/mac/fast/text/hyphenate-limit-lines-expected.txt (modified) (3 diffs)
-
LayoutTests/platform/mac/fast/text/whitespace/pre-break-word-expected.txt (modified) (1 diff)
-
LayoutTests/platform/mac/fast/text/word-break-expected.txt (modified) (7 diffs)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/page/RuntimeEnabledFeatures.h (modified) (1 diff)
-
Source/WebKit/ChangeLog (modified) (1 diff)
-
Source/WebKit/Shared/WebPreferences.yaml (modified) (1 diff)
-
Source/WebKitLegacy/mac/ChangeLog (modified) (1 diff)
-
Source/WebKitLegacy/mac/WebView/WebPreferences.mm (modified) (1 diff)
-
Tools/ChangeLog (modified) (1 diff)
-
Tools/DumpRenderTree/TestOptions.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r255115 r255117 1 2020-01-25 Antti Koivisto <antti@apple.com> 2 3 [LFC][Integration] Re-enable line layout integration 4 https://bugs.webkit.org/show_bug.cgi?id=206795 5 <rdar://problem/58853907> 6 7 Reviewed by Zalan Bujtas. 8 9 * fast/dom/Range/getBoundingClientRect-expected.txt: 10 * platform/ios/fast/text/hyphenate-limit-lines-expected.txt: 11 * platform/ios/fast/text/whitespace/pre-break-word-expected.txt: 12 * platform/ios/fast/text/word-break-expected.txt: 13 * platform/mac/fast/text/hyphenate-limit-lines-expected.txt: 14 * platform/mac/fast/text/whitespace/pre-break-word-expected.txt: 15 * platform/mac/fast/text/word-break-expected.txt: 16 1 17 2020-01-24 Ryosuke Niwa <rniwa@webkit.org> 2 18 -
trunk/LayoutTests/fast/dom/Range/getBoundingClientRect-expected.txt
r254923 r255117 49 49 Test 7 50 50 PASS rect.left.toFixed(3) is "8.000" 51 FAIL rect.top.toFixed(3) should be 2168.000. Was 2180.000. 51 PASS rect.top.toFixed(3) is "2168.000" 52 52 PASS rect.width.toFixed(3) is "192.000" 53 FAIL rect.height.toFixed(3) should be 108.000. Was 96.000. 53 PASS rect.height.toFixed(3) is "108.000" 54 54 PASS rect.right is rect.left + rect.width 55 55 PASS rect.bottom is rect.top + rect.height -
trunk/LayoutTests/platform/ios/fast/text/hyphenate-limit-lines-expected.txt
r254923 r255117 59 59 text run at (1,194) width 200: "sires into neces" + hyphen string "-" 60 60 text run at (1,226) width 200: "sary and" 61 text run at (1,258) width 200: "unnecessary\x{2014}"61 text run at (1,258) width 154: "unnecessary\x{2014}" 62 62 text run at (1,290) width 200: "these and other" 63 63 text run at (1,322) width 200: "great forms of" … … 81 81 text run at (1,226) width 166: "necessary and " 82 82 text run at (166,226) width 35: "un" + hyphen string "-" 83 text run at (1,258) width 200: "necessary\x{2014}these"83 text run at (1,258) width 181: "necessary\x{2014}these" 84 84 text run at (1,290) width 200: "and other great" 85 85 text run at (1,322) width 200: "forms of thought" … … 101 101 text run at (1,194) width 200: "desires into" 102 102 text run at (1,226) width 200: "necessary and" 103 text run at (1,258) width 200: "unnecessary\x{2014}"103 text run at (1,258) width 154: "unnecessary\x{2014}" 104 104 text run at (1,290) width 200: "these and other" 105 105 text run at (1,322) width 200: "great forms of" -
trunk/LayoutTests/platform/ios/fast/text/whitespace/pre-break-word-expected.txt
r254923 r255117 1 layer at (0,0) size 800x6001 layer at (0,0) size 920x600 2 2 RenderView at (0,0) size 800x600 3 3 layer at (0,0) size 800x600 4 4 RenderBlock {HTML} at (0,0) size 800x600 5 5 RenderBody {BODY} at (8,8) size 784x584 6 RenderBlock {DIV} at (0,0) size 154x144 [border: (2px solid #FF0000)] 7 RenderText {#text} at (2,2) size 148x139 8 text run at (2,2) width 148: "Even though this div is" 9 text run at (2,22) width 148: " white-space pre, the te" 10 text run at (2,42) width 145: "xt inside should still w" 11 text run at (2,62) width 148: "rap to multiple lines be" 12 text run at (2,82) width 143: "cause of the word-wra" 13 text run at (2,102) width 144: "p:break-word CSS pro" 14 text run at (2,122) width 36: "perty." 6 RenderBlock {DIV} at (0,0) size 154x24 [border: (2px solid #FF0000)] 7 RenderText {#text} at (2,2) size 911x19 8 text run at (2,2) width 911: "Even though this div is white-space pre, the text inside should still wrap to multiple lines because of the word-wrap:break-word CSS property." -
trunk/LayoutTests/platform/ios/fast/text/word-break-expected.txt
r254923 r255117 1 layer at (0,0) size 800x 10281 layer at (0,0) size 800x972 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 10284 RenderBlock {HTML} at (0,0) size 800x 10285 RenderBody {BODY} at (8,8) size 784x 10123 layer at (0,0) size 800x972 4 RenderBlock {HTML} at (0,0) size 800x972 5 RenderBody {BODY} at (8,8) size 784x956 6 6 RenderBlock (anonymous) at (0,0) size 784x20 7 7 RenderText {#text} at (0,0) size 700x19 … … 52 52 RenderBlock (anonymous) at (0,386) size 784x20 53 53 RenderBR {BR} at (0,0) size 0x19 54 RenderBlock {PRE} at (0,419) size 110x80 [border: (5px solid #000000)] 55 RenderText {#text} at (5,5) size 94x70 56 text run at (5,5) width 94: "Thislongword" 57 text run at (5,19) width 94: "shouldnotget" 58 text run at (5,33) width 94: "brokenbutsho" 59 text run at (5,47) width 94: "uldstickouto" 60 text run at (5,61) width 63: "fthepre." 61 text run at (67,61) width 1: " " 62 RenderBlock (anonymous) at (0,512) size 784x80 54 RenderBlock {PRE} at (0,419) size 110x24 [border: (5px solid #000000)] 55 RenderText {#text} at (5,5) size 437x14 56 text run at (5,5) width 437: "Thislongwordshouldnotgetbrokenbutshouldstickoutofthepre." 57 text run at (441,5) width 1: " " 58 RenderBlock (anonymous) at (0,456) size 784x80 63 59 RenderBR {BR} at (0,0) size 0x19 64 60 RenderText {#text} at (0,20) size 776x59 … … 68 64 text run at (304,40) width 472: "The breaking should be \"dumb\" and just occur when the end of the line is" 69 65 text run at (0,60) width 21: "hit." 70 RenderBlock {DIV} at (0,5 92) size 304x46 [border: (2px solid #000000)]66 RenderBlock {DIV} at (0,536) size 304x46 [border: (2px solid #000000)] 71 67 RenderBlock (floating) {DIV} at (2,2) size 300x42 72 68 RenderText {#text} at (0,0) size 297x42 … … 75 71 text run at (0,28) width 24: "ck." 76 72 RenderBR {BR} at (302,2) size 0x14 77 RenderBlock (anonymous) at (0, 638) size 784x2073 RenderBlock (anonymous) at (0,582) size 784x20 78 74 RenderBR {BR} at (0,0) size 0x19 79 RenderBlock (anonymous) at (0,7 62) size 784x8075 RenderBlock (anonymous) at (0,706) size 784x80 80 76 RenderBR {BR} at (0,0) size 0x19 81 77 RenderText {#text} at (0,20) size 783x59 … … 85 81 text run at (344,40) width 439: "The breaking should be \"smart\" and be like word-wrap: break-word," 86 82 text run at (0,60) width 540: "with words preferring to wrap first before allowing break opportunities within them." 87 RenderBlock {DIV} at (0, 842) size 304x46 [border: (2px solid #000000)]83 RenderBlock {DIV} at (0,786) size 304x46 [border: (2px solid #000000)] 88 84 RenderBlock (floating) {DIV} at (2,2) size 300x42 89 85 RenderText {#text} at (0,0) size 250x42 … … 92 88 text run at (0,28) width 196: "oftheenclosing300pxblock." 93 89 RenderBR {BR} at (302,2) size 0x14 94 RenderBlock (anonymous) at (0,8 88) size 784x2090 RenderBlock (anonymous) at (0,832) size 784x20 95 91 RenderBR {BR} at (0,0) size 0x19 96 layer at (8,6 66) size 304x10497 RenderBlock (relative positioned) {DIV} at (0,6 58) size 304x104 [border: (2px solid #000000)]98 layer at (10,6 68) size 300x4292 layer at (8,610) size 304x104 93 RenderBlock (relative positioned) {DIV} at (0,602) size 304x104 [border: (2px solid #000000)] 94 layer at (10,612) size 300x42 99 95 RenderBlock (positioned) {DIV} at (2,2) size 300x42 100 96 RenderText {#text} at (0,0) size 297x42 … … 102 98 text run at (0,14) width 297: "uldnotstick out oftheenclosing300pxblo" 103 99 text run at (0,28) width 24: "ck." 104 layer at (8, 916) size 304x104105 RenderBlock (relative positioned) {DIV} at (0, 908) size 304x104 [border: (2px solid #000000)]106 layer at (10, 918) size 300x42100 layer at (8,860) size 304x104 101 RenderBlock (relative positioned) {DIV} at (0,852) size 304x104 [border: (2px solid #000000)] 102 layer at (10,862) size 300x42 107 103 RenderBlock (positioned) {DIV} at (2,2) size 300x42 108 104 RenderText {#text} at (0,0) size 250x42 -
trunk/LayoutTests/platform/mac/fast/text/hyphenate-limit-lines-expected.txt
r254923 r255117 59 59 text run at (1,187) width 200: "sires into neces" + hyphen string "-" 60 60 text run at (1,218) width 200: "sary and" 61 text run at (1,249) width 200: "unnecessary\x{2014}"61 text run at (1,249) width 154: "unnecessary\x{2014}" 62 62 text run at (1,280) width 200: "these and other" 63 63 text run at (1,311) width 200: "great forms of" … … 81 81 text run at (1,218) width 166: "necessary and " 82 82 text run at (166,218) width 35: "un" + hyphen string "-" 83 text run at (1,249) width 200: "necessary\x{2014}these"83 text run at (1,249) width 181: "necessary\x{2014}these" 84 84 text run at (1,280) width 200: "and other great" 85 85 text run at (1,311) width 200: "forms of thought" … … 101 101 text run at (1,187) width 200: "desires into" 102 102 text run at (1,218) width 200: "necessary and" 103 text run at (1,249) width 200: "unnecessary\x{2014}"103 text run at (1,249) width 154: "unnecessary\x{2014}" 104 104 text run at (1,280) width 200: "these and other" 105 105 text run at (1,311) width 200: "great forms of" -
trunk/LayoutTests/platform/mac/fast/text/whitespace/pre-break-word-expected.txt
r254923 r255117 1 layer at (0,0) size 800x600 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x600 4 RenderBlock {HTML} at (0,0) size 800x600 5 RenderBody {BODY} at (8,8) size 784x584 6 RenderBlock {DIV} at (0,0) size 154x130 [border: (2px solid #FF0000)] 7 RenderText {#text} at (2,2) size 148x126 8 text run at (2,2) width 148: "Even though this div is" 9 text run at (2,20) width 148: " white-space pre, the te" 10 text run at (2,38) width 145: "xt inside should still w" 11 text run at (2,56) width 148: "rap to multiple lines be" 12 text run at (2,74) width 143: "cause of the word-wra" 13 text run at (2,92) width 144: "p:break-word CSS pro" 14 text run at (2,110) width 36: "perty." 1 layer at (0,0) size 920x585 2 RenderView at (0,0) size 800x585 3 layer at (0,0) size 800x585 4 RenderBlock {HTML} at (0,0) size 800x585 5 RenderBody {BODY} at (8,8) size 784x569 6 RenderBlock {DIV} at (0,0) size 154x22 [border: (2px solid #FF0000)] 7 RenderText {#text} at (2,2) size 911x18 8 text run at (2,2) width 911: "Even though this div is white-space pre, the text inside should still wrap to multiple lines because of the word-wrap:break-word CSS property." -
trunk/LayoutTests/platform/mac/fast/text/word-break-expected.txt
r254923 r255117 1 layer at (0,0) size 785x 10161 layer at (0,0) size 785x956 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x 10164 RenderBlock {HTML} at (0,0) size 785x 10165 RenderBody {BODY} at (8,8) size 769x 10003 layer at (0,0) size 785x956 4 RenderBlock {HTML} at (0,0) size 785x956 5 RenderBody {BODY} at (8,8) size 769x940 6 6 RenderBlock (anonymous) at (0,0) size 769x18 7 7 RenderText {#text} at (0,0) size 700x18 … … 52 52 RenderBlock (anonymous) at (0,385) size 769x18 53 53 RenderBR {BR} at (0,0) size 0x18 54 RenderBlock {PRE} at (0,416) size 110x85 [border: (5px solid #000000)] 55 RenderText {#text} at (5,5) size 94x75 56 text run at (5,5) width 94: "Thislongword" 57 text run at (5,20) width 94: "shouldnotget" 58 text run at (5,35) width 94: "brokenbutsho" 59 text run at (5,50) width 94: "uldstickouto" 60 text run at (5,65) width 63: "fthepre." 61 text run at (67,65) width 1: " " 62 RenderBlock (anonymous) at (0,514) size 769x72 54 RenderBlock {PRE} at (0,416) size 110x25 [border: (5px solid #000000)] 55 RenderText {#text} at (5,5) size 437x15 56 text run at (5,5) width 437: "Thislongwordshouldnotgetbrokenbutshouldstickoutofthepre." 57 text run at (441,5) width 1: " " 58 RenderBlock (anonymous) at (0,454) size 769x72 63 59 RenderBR {BR} at (0,0) size 0x18 64 60 RenderText {#text} at (0,18) size 750x54 … … 68 64 text run at (344,36) width 406: "The breaking should be \"dumb\" and just occur when the end of" 69 65 text run at (0,54) width 88: "the line is hit." 70 RenderBlock {DIV} at (0,5 86) size 304x49 [border: (2px solid #000000)]66 RenderBlock {DIV} at (0,526) size 304x49 [border: (2px solid #000000)] 71 67 RenderBlock (floating) {DIV} at (2,2) size 300x45 72 68 RenderText {#text} at (0,0) size 297x45 … … 75 71 text run at (0,30) width 24: "ck." 76 72 RenderBR {BR} at (302,2) size 0x15 77 RenderBlock (anonymous) at (0, 635) size 769x1873 RenderBlock (anonymous) at (0,575) size 769x18 78 74 RenderBR {BR} at (0,0) size 0x18 79 RenderBlock (anonymous) at (0, 757) size 769x7275 RenderBlock (anonymous) at (0,697) size 769x72 80 76 RenderBR {BR} at (0,0) size 0x18 81 77 RenderText {#text} at (0,18) size 748x54 … … 85 81 text run at (344,36) width 402: "The breaking should be \"smart\" and be like word-wrap: break-" 86 82 text run at (0,54) width 580: "word, with words preferring to wrap first before allowing break opportunities within them." 87 RenderBlock {DIV} at (0, 829) size 304x49 [border: (2px solid #000000)]83 RenderBlock {DIV} at (0,769) size 304x49 [border: (2px solid #000000)] 88 84 RenderBlock (floating) {DIV} at (2,2) size 300x45 89 85 RenderText {#text} at (0,0) size 250x45 … … 92 88 text run at (0,30) width 196: "oftheenclosing300pxblock." 93 89 RenderBR {BR} at (302,2) size 0x15 94 RenderBlock (anonymous) at (0,8 78) size 769x1890 RenderBlock (anonymous) at (0,818) size 769x18 95 91 RenderBR {BR} at (0,0) size 0x18 96 layer at (8,6 61) size 304x10497 RenderBlock (relative positioned) {DIV} at (0, 653) size 304x104 [border: (2px solid #000000)]98 layer at (10,6 63) size 300x4592 layer at (8,601) size 304x104 93 RenderBlock (relative positioned) {DIV} at (0,593) size 304x104 [border: (2px solid #000000)] 94 layer at (10,603) size 300x45 99 95 RenderBlock (positioned) {DIV} at (2,2) size 300x45 100 96 RenderText {#text} at (0,0) size 297x45 … … 102 98 text run at (0,15) width 297: "uldnotstick out oftheenclosing300pxblo" 103 99 text run at (0,30) width 24: "ck." 104 layer at (8, 904) size 304x104105 RenderBlock (relative positioned) {DIV} at (0,8 96) size 304x104 [border: (2px solid #000000)]106 layer at (10, 906) size 300x45100 layer at (8,844) size 304x104 101 RenderBlock (relative positioned) {DIV} at (0,836) size 304x104 [border: (2px solid #000000)] 102 layer at (10,846) size 300x45 107 103 RenderBlock (positioned) {DIV} at (2,2) size 300x45 108 104 RenderText {#text} at (0,0) size 250x45 -
trunk/Source/WebCore/ChangeLog
r255116 r255117 1 2020-01-25 Antti Koivisto <antti@apple.com> 2 3 [LFC][Integration] Re-enable line layout integration 4 https://bugs.webkit.org/show_bug.cgi?id=206795 5 <rdar://problem/58853907> 6 7 Reviewed by Zalan Bujtas. 8 9 * page/RuntimeEnabledFeatures.h: 10 1 11 2020-01-25 youenn fablet <youenn@apple.com> 2 12 -
trunk/Source/WebCore/page/RuntimeEnabledFeatures.h
r254923 r255117 455 455 #if ENABLE(LAYOUT_FORMATTING_CONTEXT) 456 456 bool m_layoutFormattingContextEnabled { false }; 457 bool m_layoutFormattingContextIntegrationEnabled { false };457 bool m_layoutFormattingContextIntegrationEnabled { true }; 458 458 #endif 459 459 -
trunk/Source/WebKit/ChangeLog
r255114 r255117 1 2020-01-25 Antti Koivisto <antti@apple.com> 2 3 [LFC][Integration] Re-enable line layout integration 4 https://bugs.webkit.org/show_bug.cgi?id=206795 5 <rdar://problem/58853907> 6 7 Reviewed by Zalan Bujtas. 8 9 * Shared/WebPreferences.yaml: 10 1 11 2020-01-24 Tim Horton <timothy_horton@apple.com> 2 12 -
trunk/Source/WebKit/Shared/WebPreferences.yaml
r254923 r255117 1693 1693 LayoutFormattingContextIntegrationEnabled: 1694 1694 type: bool 1695 defaultValue: false1695 defaultValue: true 1696 1696 humanReadableName: "Next-generation line layout integration (LFC)" 1697 1697 humanReadableDescription: "Enable next-generation line layout integration (LFC)" -
trunk/Source/WebKitLegacy/mac/ChangeLog
r254952 r255117 1 2020-01-25 Antti Koivisto <antti@apple.com> 2 3 [LFC][Integration] Re-enable line layout integration 4 https://bugs.webkit.org/show_bug.cgi?id=206795 5 <rdar://problem/58853907> 6 7 Reviewed by Zalan Bujtas. 8 9 * WebView/WebPreferences.mm: 10 (+[WebPreferences initialize]): 11 1 12 2020-01-22 Daniel Bates <dabates@apple.com> 2 13 -
trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
r254932 r255117 635 635 @YES, WebKitModernMediaControlsEnabledPreferenceKey, 636 636 @YES, WebKitWebAnimationsCSSIntegrationEnabledPreferenceKey, 637 @ NO, WebKitLayoutFormattingContextIntegrationEnabledPreferenceKey,637 @YES, WebKitLayoutFormattingContextIntegrationEnabledPreferenceKey, 638 638 639 639 #if ENABLE(WEBGL2) -
trunk/Tools/ChangeLog
r255116 r255117 1 2020-01-25 Antti Koivisto <antti@apple.com> 2 3 [LFC][Integration] Re-enable line layout integration 4 https://bugs.webkit.org/show_bug.cgi?id=206795 5 <rdar://problem/58853907> 6 7 Reviewed by Zalan Bujtas. 8 9 * DumpRenderTree/TestOptions.h: 10 1 11 2020-01-25 Youenn Fablet <youenn@apple.com> 2 12 -
trunk/Tools/DumpRenderTree/TestOptions.h
r254923 r255117 55 55 bool enableRequestIdleCallback { false }; 56 56 bool enableAsyncClipboardAPI { false }; 57 bool layoutFormattingContextIntegrationEnabled { false };57 bool layoutFormattingContextIntegrationEnabled { true }; 58 58 bool enableAspectRatioOfImgFromWidthAndHeight { false }; 59 59 bool enableWebSQL { true };
Note: See TracChangeset
for help on using the changeset viewer.
