Changeset 254428 in webkit
- Timestamp:
- Jan 13, 2020 4:47:32 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 16 edited
-
LayoutTests/ChangeLog (modified) (1 diff)
-
LayoutTests/TestExpectations (modified) (1 diff)
-
LayoutTests/fast/dom/Range/getBoundingClientRect-expected.txt (modified) (1 diff)
-
LayoutTests/fast/dom/Range/getBoundingClientRect.html (modified) (1 diff)
-
LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
-
LayoutTests/platform/ios/fast/text/whitespace/pre-break-word-expected.txt (modified) (1 diff)
-
LayoutTests/platform/ios/fast/text/word-break-expected.txt (modified) (9 diffs)
-
LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
-
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)
-
LayoutTests/platform/win/TestExpectations (modified) (1 diff)
-
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)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r254426 r254428 1 2020-01-13 Antti Koivisto <antti@apple.com> 2 3 [LFC][Integration] Enable LFC integration 4 https://bugs.webkit.org/show_bug.cgi?id=206128 5 6 Reviewed by Zalan Bujtas. 7 8 Rebase for some progressions. 9 10 * fast/dom/Range/getBoundingClientRect-expected.txt: 11 * fast/dom/Range/getBoundingClientRect.html: 12 13 Update the test for new results. These match the complex line layout results (simple lines produce wrong results). 14 15 * platform/ios/fast/text/whitespace/pre-break-word-expected.txt: 16 * platform/ios/fast/text/word-break-expected.txt: 17 * platform/mac/fast/text/hyphenate-limit-lines-expected.txt: 18 * platform/mac/fast/text/whitespace/pre-break-word-expected.txt: 19 * platform/mac/fast/text/word-break-expected.txt: 20 21 Line breaking and white-space progressions. 22 23 * platform/ios/TestExpectations: 24 25 A subtest of editing/text-iterator/findString.html fails on iOS. This needs futher analysis. 26 27 * platform/win/TestExpectations: 28 29 fast/dom/Range/getBoundingClientRect.html now fails on windows because LFC is not enabled there. 30 1 31 2020-01-13 Antti Koivisto <antti@apple.com> 2 32 -
trunk/LayoutTests/TestExpectations
r254408 r254428 3223 3223 # Re-enable as each chunk of tests are verified with ANGLE backend. 3224 3224 webgl/2.0.0 [ Skip ] 3225 3226 webkit.org/b/206168 [ Debug ] fast/dom/insert-span-into-long-text-bug-28245.html [ Skip ] -
trunk/LayoutTests/fast/dom/Range/getBoundingClientRect-expected.txt
r245534 r254428 49 49 Test 7 50 50 PASS rect.left.toFixed(3) is "8.000" 51 PASS rect.top.toFixed(3) is "21 80.000"51 PASS rect.top.toFixed(3) is "2168.000" 52 52 PASS rect.width.toFixed(3) is "192.000" 53 PASS rect.height.toFixed(3) is " 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/fast/dom/Range/getBoundingClientRect.html
r245534 r254428 116 116 /*5*/ { left: -14.574, top: 1761.947, width: 504.009, height: 535.849 }, 117 117 /*6*/ { left: 0, top: 0, width: 0, height: 0 }, 118 /*7*/ { left: 8, top: 21 80, width: 192, height: 96},118 /*7*/ { left: 8, top: 2168, width: 192, height: 108 }, 119 119 ]; 120 120 -
trunk/LayoutTests/platform/ios/TestExpectations
r254415 r254428 3463 3463 3464 3464 webkit.org/b/200043 fast/text/international/system-language/navigator-language [ Pass Failure ] 3465 3466 webkit.org/b/206164 editing/text-iterator/findString.html [ Failure ] -
trunk/LayoutTests/platform/ios/fast/text/whitespace/pre-break-word-expected.txt
r179104 r254428 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
r194965 r254428 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 … … 18 18 text run at (6,62) width 8: "o" 19 19 text run at (6,76) width 8: "w" 20 RenderTableCell {TD} at ( 20,35) size 762x26 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]20 RenderTableCell {TD} at (19,35) size 763x26 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] 21 21 RenderText {#text} at (6,6) size 164x14 22 22 text run at (6,6) width 164: "This cell should grow" … … 28 28 RenderText {#text} at (5,5) size 437x14 29 29 text run at (5,5) width 437: "Thislongwordshouldnotgetbrokenbutshouldstickoutofthepre." 30 text run at (441,5) width 1: " " 30 31 RenderBlock (anonymous) at (0,208) size 784x80 31 32 RenderBR {BR} at (0,0) size 0x19 … … 46 47 text run at (6,62) width 8: "o" 47 48 text run at (6,76) width 8: "w" 48 RenderTableCell {TD} at ( 20,35) size 762x26 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]49 RenderTableCell {TD} at (19,35) size 763x26 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] 49 50 RenderText {#text} at (6,6) size 164x14 50 51 text run at (6,6) width 164: "This cell should grow" 51 52 RenderBlock (anonymous) at (0,386) size 784x20 52 53 RenderBR {BR} at (0,0) size 0x19 53 RenderBlock {PRE} at (0,419) size 110x80 [border: (5px solid #000000)] 54 RenderText {#text} at (5,5) size 94x70 55 text run at (5,5) width 94: "Thislongword" 56 text run at (5,19) width 94: "shouldnotget" 57 text run at (5,33) width 94: "brokenbutsho" 58 text run at (5,47) width 94: "uldstickouto" 59 text run at (5,61) width 63: "fthepre." 60 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 61 59 RenderBR {BR} at (0,0) size 0x19 62 60 RenderText {#text} at (0,20) size 776x59 … … 66 64 text run at (304,40) width 472: "The breaking should be \"dumb\" and just occur when the end of the line is" 67 65 text run at (0,60) width 21: "hit." 68 RenderBlock {DIV} at (0,5 92) size 304x46 [border: (2px solid #000000)]66 RenderBlock {DIV} at (0,536) size 304x46 [border: (2px solid #000000)] 69 67 RenderBlock (floating) {DIV} at (2,2) size 300x42 70 68 RenderText {#text} at (0,0) size 297x42 … … 73 71 text run at (0,28) width 24: "ck." 74 72 RenderBR {BR} at (302,2) size 0x14 75 RenderBlock (anonymous) at (0, 638) size 784x2073 RenderBlock (anonymous) at (0,582) size 784x20 76 74 RenderBR {BR} at (0,0) size 0x19 77 RenderBlock (anonymous) at (0,7 62) size 784x8075 RenderBlock (anonymous) at (0,706) size 784x80 78 76 RenderBR {BR} at (0,0) size 0x19 79 77 RenderText {#text} at (0,20) size 783x59 … … 83 81 text run at (344,40) width 439: "The breaking should be \"smart\" and be like word-wrap: break-word," 84 82 text run at (0,60) width 540: "with words preferring to wrap first before allowing break opportunities within them." 85 RenderBlock {DIV} at (0, 842) size 304x46 [border: (2px solid #000000)]83 RenderBlock {DIV} at (0,786) size 304x46 [border: (2px solid #000000)] 86 84 RenderBlock (floating) {DIV} at (2,2) size 300x42 87 85 RenderText {#text} at (0,0) size 250x42 … … 90 88 text run at (0,28) width 196: "oftheenclosing300pxblock." 91 89 RenderBR {BR} at (302,2) size 0x14 92 RenderBlock (anonymous) at (0,8 88) size 784x2090 RenderBlock (anonymous) at (0,832) size 784x20 93 91 RenderBR {BR} at (0,0) size 0x19 94 layer at (8,6 66) size 304x10495 RenderBlock (relative positioned) {DIV} at (0,6 58) size 304x104 [border: (2px solid #000000)]96 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 97 95 RenderBlock (positioned) {DIV} at (2,2) size 300x42 98 96 RenderText {#text} at (0,0) size 297x42 … … 100 98 text run at (0,14) width 297: "uldnotstick out oftheenclosing300pxblo" 101 99 text run at (0,28) width 24: "ck." 102 layer at (8, 916) size 304x104103 RenderBlock (relative positioned) {DIV} at (0, 908) size 304x104 [border: (2px solid #000000)]104 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 105 103 RenderBlock (positioned) {DIV} at (2,2) size 300x42 106 104 RenderText {#text} at (0,0) size 250x42 -
trunk/LayoutTests/platform/mac-wk1/TestExpectations
r254385 r254428 847 847 webkit.org/b/206071 editing/spelling/markers.html [ Skip ] 848 848 webkit.org/b/206071 editing/spelling/retro-correction-spelling-markers.html [ Failure ] 849 850 # These simple line layout specific tests disable LFC in test header. This is not supported in DRT. 851 webkit.org/b/206167 fast/text/embed-at-end-of-pre-wrap-line-simple-lines.html [ Failure ] 852 webkit.org/b/206167 fast/text/simple-line-layout-leading-whitespace-with-soft-hard-linebreak.html [ Failure ] 853 webkit.org/b/206167 fast/text/simple-lines-float.html [ Failure ] 854 webkit.org/b/206167 fast/text/whitespace/pre-wrap-long-word-simple-lines.html [ Failure ] -
trunk/LayoutTests/platform/mac/fast/text/hyphenate-limit-lines-expected.txt
r214072 r254428 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
r177774 r254428 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
r254044 r254428 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/LayoutTests/platform/win/TestExpectations
r254323 r254428 4520 4520 4521 4521 webkit.org/b/205856 storage/indexeddb/IDBTransaction-page-cache.html [ Pass Timeout ] 4522 4523 webkit.org/b/206165 fast/dom/Range/getBoundingClientRect.html [ Failure ] -
trunk/Source/WebCore/ChangeLog
r254427 r254428 1 2020-01-13 Antti Koivisto <antti@apple.com> 2 3 [LFC][Integration] Enable LFC integration 4 https://bugs.webkit.org/show_bug.cgi?id=206128 5 6 Reviewed by Zalan Bujtas. 7 8 Enable the new line layout path. 9 10 * page/RuntimeEnabledFeatures.h: 11 1 12 2020-01-13 Antti Koivisto <antti@apple.com> 2 13 -
trunk/Source/WebCore/page/RuntimeEnabledFeatures.h
r254115 r254428 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
r254424 r254428 1 2020-01-13 Antti Koivisto <antti@apple.com> 2 3 [LFC][Integration] Enable LFC integration 4 https://bugs.webkit.org/show_bug.cgi?id=206128 5 6 Reviewed by Zalan Bujtas. 7 8 * Shared/WebPreferences.yaml: 9 1 10 2020-01-13 Carlos Garcia Campos <cgarcia@igalia.com> 2 11 -
trunk/Source/WebKit/Shared/WebPreferences.yaml
r254293 r254428 1680 1680 LayoutFormattingContextIntegrationEnabled: 1681 1681 type: bool 1682 defaultValue: false1682 defaultValue: true 1683 1683 humanReadableName: "Next-generation line layout integration (LFC)" 1684 1684 humanReadableDescription: "Enable next-generation line layout integration (LFC)"
Note: See TracChangeset
for help on using the changeset viewer.
