Changeset 151737 in webkit
- Timestamp:
- Jun 19, 2013 10:20:46 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r151733 r151737 1 2013-06-19 Robert Hogan <robert@webkit.org> 2 3 Incorrect computation of shrink-to-fit width for block with white-space:nowrap and floating children 4 https://bugs.webkit.org/show_bug.cgi?id=114879 5 6 Reviewed by David Hyatt. 7 8 * fast/block/shrink-to-fit-width-container-with-floating-children-expected.txt: Added. 9 * fast/block/shrink-to-fit-width-container-with-floating-children.html: Added. 10 * platform/qt/fast/css/word-space-extra-expected.txt: 11 * platform/qt/fast/replaced/width100percent-image-expected.txt: 12 * platform/qt/fast/replaced/width100percent-searchfield-expected.txt: 13 * platform/qt/fast/replaced/width100percent-textfield-expected.txt: 14 * platform/qt/tables/mozilla/bugs/bug57828-expected.txt: 15 1 16 2013-06-19 Víctor Manuel Jáquez Leal <vjaquez@igalia.com> 2 17 -
trunk/LayoutTests/platform/mac/fast/css/word-space-extra-expected.txt
r149210 r151737 7 7 RenderText {#text} at (0,0) size 138x28 8 8 text run at (0,0) width 138: "word-spacing" 9 RenderBlock (floating) {PRE} at (0,60) size 1 264x16710 RenderBlock {H3} at (0,15) size 1 264x179 RenderBlock (floating) {PRE} at (0,60) size 1004x167 10 RenderBlock {H3} at (0,15) size 1004x17 11 11 RenderText {#text} at (0,0) size 204x17 12 12 text run at (0,0) width 204: "In a floated pre" 13 RenderBlock (anonymous) at (0,47) size 1 264x12013 RenderBlock (anonymous) at (0,47) size 1004x120 14 14 RenderText {#text} at (0,0) size 260x30 15 15 text run at (0,0) width 0: " " … … 146 146 text run at (1108,105) width 0: " " 147 147 RenderBlock (anonymous) at (0,47) size 769x193 148 RenderBR {BR} at (1 264,0) size 0x18148 RenderBR {BR} at (1004,0) size 0x18 149 149 RenderBlock {PRE} at (0,255) size 769x152 150 150 RenderBlock {H3} at (0,0) size 769x17 … … 450 450 RenderText {#text} at (0,0) size 141x28 451 451 text run at (0,0) width 141: "letter-spacing" 452 RenderBlock (floating) {PRE} at (0,814) size 1 521x167453 RenderBlock {H3} at (0,15) size 1 521x17452 RenderBlock (floating) {PRE} at (0,814) size 1209x167 453 RenderBlock {H3} at (0,15) size 1209x17 454 454 RenderText {#text} at (0,0) size 224x17 455 455 text run at (0,0) width 224: "In a floated pre" 456 RenderBlock (anonymous) at (0,47) size 1 521x120456 RenderBlock (anonymous) at (0,47) size 1209x120 457 457 RenderText {#text} at (0,0) size 286x30 458 458 text run at (0,0) width 0: " " … … 589 589 text run at (1274,105) width 0: " " 590 590 RenderBlock (anonymous) at (0,801) size 769x193 591 RenderBR {BR} at (1 521,0) size 0x18591 RenderBR {BR} at (1209,0) size 0x18 592 592 RenderBlock {PRE} at (0,1009) size 769x152 593 593 RenderBlock {H3} at (0,0) size 769x17 … … 894 894 RenderText {#text} at (0,0) size 131x28 895 895 text run at (0,0) width 131: "both-spacing" 896 RenderBlock (floating) {PRE} at (0,1599) size 2018x167897 RenderBlock {H3} at (0,15) size 2018x17896 RenderBlock (floating) {PRE} at (0,1599) size 1469x167 897 RenderBlock {H3} at (0,15) size 1469x17 898 898 RenderText {#text} at (0,0) size 284x17 899 899 text run at (0,0) width 284: "In a floated pre" 900 RenderBlock (anonymous) at (0,47) size 2018x120900 RenderBlock (anonymous) at (0,47) size 1469x120 901 901 RenderText {#text} at (0,0) size 543x30 902 902 text run at (0,0) width 0: " " … … 1033 1033 text run at (1771,105) width 0: " " 1034 1034 RenderBlock (anonymous) at (0,1586) size 769x193 1035 RenderBR {BR} at ( 2018,0) size 0x181035 RenderBR {BR} at (1469,0) size 0x18 1036 1036 RenderBlock {PRE} at (0,1794) size 769x152 1037 1037 RenderBlock {H3} at (0,0) size 769x17 -
trunk/LayoutTests/platform/mac/fast/replaced/width100percent-image-expected.txt
r142945 r151737 12 12 RenderTableSection {TBODY} at (0,0) size 769x279 13 13 RenderTableRow {TR} at (0,1) size 769x277 14 RenderTableCell {TD} at (1,1) size 2 16x277 [r=0 c=0 rs=1 cs=1]14 RenderTableCell {TD} at (1,1) size 2x277 [r=0 c=0 rs=1 cs=1] 15 15 RenderImage {IMG} at (1,1) size 214x275 16 RenderTableCell {TD} at ( 218,1) size 2x277 [r=0 c=1 rs=1 cs=1]16 RenderTableCell {TD} at (4,1) size 2x277 [r=0 c=1 rs=1 cs=1] 17 17 RenderImage {IMG} at (1,1) size 214x275 18 RenderTableCell {TD} at ( 221,1) size 2x277 [r=0 c=2 rs=1 cs=1]18 RenderTableCell {TD} at (7,1) size 2x277 [r=0 c=2 rs=1 cs=1] 19 19 RenderImage {IMG} at (1,1) size 214x275 20 RenderTableCell {TD} at ( 224,129) size 544x20 [r=0 c=3 rs=1 cs=1]20 RenderTableCell {TD} at (10,129) size 758x20 [r=0 c=3 rs=1 cs=1] 21 21 RenderText {#text} at (1,1) size 4x18 22 22 text run at (1,1) width 4: " " -
trunk/LayoutTests/platform/mac/fast/replaced/width100percent-menulist-expected.txt
r30635 r151737 10 10 RenderTableSection {TBODY} at (0,0) size 784x26 11 11 RenderTableRow {TR} at (0,1) size 784x24 12 RenderTableCell {TD} at (1,1) size 53x24 [r=0 c=0 rs=1 cs=1]13 RenderMenuList {SELECT} at (1,3) size 51x18 [bgcolor=#FFFFFF]14 RenderBlock (anonymous) at (0,0) size 51x1812 RenderTableCell {TD} at (1,1) size 2x24 [r=0 c=0 rs=1 cs=1] 13 RenderMenuList {SELECT} at (1,3) size 0x18 [bgcolor=#FFFFFF] 14 RenderBlock (anonymous) at (0,0) size 31x18 15 15 RenderText at (8,2) size 20x13 16 16 text run at (8,2) width 20: "one" 17 RenderTableCell {TD} at ( 55,1) size 2x24 [r=0 c=1 rs=1 cs=1]17 RenderTableCell {TD} at (4,1) size 2x24 [r=0 c=1 rs=1 cs=1] 18 18 RenderMenuList {SELECT} at (1,3) size 0x18 [bgcolor=#FFFFFF] 19 19 RenderBlock (anonymous) at (0,0) size 31x18 20 20 RenderText at (8,2) size 20x13 21 21 text run at (8,2) width 20: "two" 22 RenderTableCell {TD} at ( 58,1) size 2x24 [r=0 c=2 rs=1 cs=1]22 RenderTableCell {TD} at (7,1) size 2x24 [r=0 c=2 rs=1 cs=1] 23 23 RenderMenuList {SELECT} at (1,3) size 0x18 [bgcolor=#FFFFFF] 24 24 RenderBlock (anonymous) at (0,0) size 31x18 25 25 RenderText at (8,2) size 28x13 26 26 text run at (8,2) width 28: "three" 27 RenderTableCell {TD} at ( 61,3) size 722x20 [r=0 c=3 rs=1 cs=1]27 RenderTableCell {TD} at (10,3) size 773x20 [r=0 c=3 rs=1 cs=1] 28 28 RenderText {#text} at (1,1) size 4x18 29 29 text run at (1,1) width 4: " " -
trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt
r145977 r151737 10 10 RenderTableSection {TBODY} at (0,0) size 784x27 11 11 RenderTableRow {TR} at (0,1) size 784x25 12 RenderTableCell {TD} at (1,1) size 125x25 [r=0 c=0 rs=1 cs=1] 13 RenderTextControl {INPUT} at (1,3) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 14 RenderFlexibleBox {DIV} at (3,3) size 117x13 15 RenderBlock {DIV} at (0,1) size 8x11 16 RenderBlock {DIV} at (8,0) size 96x13 17 RenderBlock {DIV} at (104,1) size 13x11 18 RenderTableCell {TD} at (127,1) size 8x25 [r=0 c=1 rs=1 cs=1] 12 RenderTableCell {TD} at (1,1) size 8x25 [r=0 c=0 rs=1 cs=1] 19 13 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 20 14 RenderFlexibleBox {DIV} at (3,3) size 0x13 … … 22 16 RenderBlock {DIV} at (8,0) size 0x13 23 17 RenderBlock {DIV} at (8,1) size 13x11 24 RenderTableCell {TD} at (1 36,1) size 8x25 [r=0 c=2rs=1 cs=1]18 RenderTableCell {TD} at (10,1) size 8x25 [r=0 c=1 rs=1 cs=1] 25 19 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 26 20 RenderFlexibleBox {DIV} at (3,3) size 0x13 … … 28 22 RenderBlock {DIV} at (8,0) size 0x13 29 23 RenderBlock {DIV} at (8,1) size 13x11 30 RenderTableCell {TD} at (145,3) size 638x20 [r=0 c=3 rs=1 cs=1] 24 RenderTableCell {TD} at (19,1) size 8x25 [r=0 c=2 rs=1 cs=1] 25 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 26 RenderFlexibleBox {DIV} at (3,3) size 0x13 27 RenderBlock {DIV} at (0,1) size 8x11 28 RenderBlock {DIV} at (8,0) size 0x13 29 RenderBlock {DIV} at (8,1) size 13x11 30 RenderTableCell {TD} at (28,3) size 755x20 [r=0 c=3 rs=1 cs=1] 31 31 RenderText {#text} at (1,1) size 4x18 32 32 text run at (1,1) width 4: " " … … 37 37 RenderTableSection {TBODY} at (0,0) size 784x27 38 38 RenderTableRow {TR} at (0,1) size 784x25 39 RenderTableCell {TD} at (1,1) size 525x25 [r=0 c=0 rs=1 cs=1] 40 RenderTextControl {INPUT} at (1,3) size 523x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 41 RenderFlexibleBox {DIV} at (3,3) size 517x13 42 RenderBlock {DIV} at (0,1) size 22x11 43 RenderBlock {DIV} at (22,0) size 482x13 44 RenderBlock {DIV} at (504,1) size 13x11 45 RenderTableCell {TD} at (527,1) size 8x25 [r=0 c=1 rs=1 cs=1] 39 RenderTableCell {TD} at (1,1) size 8x25 [r=0 c=0 rs=1 cs=1] 46 40 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 47 41 RenderFlexibleBox {DIV} at (3,3) size 0x13 … … 49 43 RenderBlock {DIV} at (22,0) size 0x13 50 44 RenderBlock {DIV} at (22,1) size 13x11 51 RenderTableCell {TD} at ( 536,1) size 8x25 [r=0 c=2rs=1 cs=1]45 RenderTableCell {TD} at (10,1) size 8x25 [r=0 c=1 rs=1 cs=1] 52 46 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 53 47 RenderFlexibleBox {DIV} at (3,3) size 0x13 … … 55 49 RenderBlock {DIV} at (22,0) size 0x13 56 50 RenderBlock {DIV} at (22,1) size 13x11 57 RenderTableCell {TD} at (545,3) size 238x20 [r=0 c=3 rs=1 cs=1] 51 RenderTableCell {TD} at (19,1) size 8x25 [r=0 c=2 rs=1 cs=1] 52 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 53 RenderFlexibleBox {DIV} at (3,3) size 0x13 54 RenderBlock {DIV} at (0,1) size 22x11 55 RenderBlock {DIV} at (22,0) size 0x13 56 RenderBlock {DIV} at (22,1) size 13x11 57 RenderTableCell {TD} at (28,3) size 755x20 [r=0 c=3 rs=1 cs=1] 58 58 RenderText {#text} at (1,1) size 4x18 59 59 text run at (1,1) width 4: " " 60 layer at (21,33) size 96x1361 RenderBlock {DIV} at (0,0) size 96x1362 RenderText {#text} at (0,0) size 49x1363 text run at (0,0) width 49: "New Mail"64 layer at (35,96) size 482x1365 RenderBlock {DIV} at (0,0) size 482x1366 RenderText {#text} at (0,0) size 49x1367 text run at (0,0) width 49: "New Mail" -
trunk/LayoutTests/platform/mac/fast/replaced/width100percent-textarea-expected.txt
r149210 r151737 10 10 RenderTableSection {TBODY} at (0,0) size 784x40 11 11 RenderTableRow {TR} at (0,1) size 784x38 12 RenderTableCell {TD} at (1,1) size 163x38 [r=0 c=0 rs=1 cs=1]13 RenderTableCell {TD} at (1 65,1) size 8x38 [r=0 c=1 rs=1 cs=1]14 RenderTableCell {TD} at (1 74,1) size 8x38 [r=0 c=2 rs=1 cs=1]15 RenderTableCell {TD} at ( 183,10) size 600x20 [r=0 c=3 rs=1 cs=1]12 RenderTableCell {TD} at (1,1) size 8x38 [r=0 c=0 rs=1 cs=1] 13 RenderTableCell {TD} at (10,1) size 8x38 [r=0 c=1 rs=1 cs=1] 14 RenderTableCell {TD} at (19,1) size 8x38 [r=0 c=2 rs=1 cs=1] 15 RenderTableCell {TD} at (28,10) size 755x20 [r=0 c=3 rs=1 cs=1] 16 16 RenderText {#text} at (1,1) size 4x18 17 17 text run at (1,1) width 4: " " … … 22 22 RenderTableSection {TBODY} at (0,0) size 784x40 23 23 RenderTableRow {TR} at (0,1) size 784x38 24 RenderTableCell {TD} at (1,1) size 233x38 [r=0 c=0 rs=1 cs=1]25 RenderTableCell {TD} at ( 235,1) size 8x38 [r=0 c=1 rs=1 cs=1]26 RenderTableCell {TD} at ( 244,1) size 8x38 [r=0 c=2 rs=1 cs=1]27 RenderTableCell {TD} at (2 53,10) size 530x20 [r=0 c=3 rs=1 cs=1]24 RenderTableCell {TD} at (1,1) size 8x38 [r=0 c=0 rs=1 cs=1] 25 RenderTableCell {TD} at (10,1) size 8x38 [r=0 c=1 rs=1 cs=1] 26 RenderTableCell {TD} at (19,1) size 8x38 [r=0 c=2 rs=1 cs=1] 27 RenderTableCell {TD} at (28,10) size 755x20 [r=0 c=3 rs=1 cs=1] 28 28 RenderText {#text} at (1,1) size 4x18 29 29 text run at (1,1) width 4: " " 30 layer at (10,30) size 161x32 clip at (11,31) size 159x30 31 RenderTextControl {TEXTAREA} at (1,3) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)] 32 RenderBlock {DIV} at (3,3) size 155x13 33 RenderText {#text} at (0,0) size 20x13 34 text run at (0,0) width 20: "one" 35 layer at (174,30) size 6x32 clip at (0,0) size 0x0 scrollWidth 11 scrollHeight 43 30 layer at (10,30) size 6x32 clip at (0,0) size 0x0 scrollWidth 9 scrollHeight 43 31 RenderTextControl {TEXTAREA} at (1,3) size 6x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)] 32 RenderBlock {DIV} at (3,3) size 0x39 33 RenderText {#text} at (0,0) size 7x39 34 text run at (0,0) width 7: "o" 35 text run at (0,13) width 7: "n" 36 text run at (0,26) width 7: "e" 37 layer at (19,30) size 6x32 clip at (0,0) size 0x0 scrollWidth 11 scrollHeight 43 36 38 RenderTextControl {TEXTAREA} at (1,3) size 6x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)] 37 39 RenderBlock {DIV} at (3,3) size 0x39 … … 40 42 text run at (0,13) width 9: "w" 41 43 text run at (0,26) width 7: "o" 42 layer at ( 183,30) size 6x32 clip at (0,0) size 0x0 scrollWidth 9 scrollHeight 6944 layer at (28,30) size 6x32 clip at (0,0) size 0x0 scrollWidth 9 scrollHeight 69 43 45 RenderTextControl {TEXTAREA} at (1,3) size 6x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)] 44 46 RenderBlock {DIV} at (3,3) size 0x65 … … 49 51 text run at (0,39) width 7: "e" 50 52 text run at (0,52) width 7: "e" 51 layer at (10,106) size 231x32 clip at (11,107) size 229x30 52 RenderTextControl {TEXTAREA} at (1,3) size 231x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)] 53 RenderBlock {DIV} at (3,3) size 225x13 54 RenderText {#text} at (0,0) size 74x13 55 text run at (0,0) width 74: "one two three" 56 layer at (244,106) size 6x32 clip at (0,0) size 0x0 scrollWidth 11 scrollHeight 43 53 layer at (10,106) size 6x32 clip at (0,0) size 0x0 scrollWidth 11 scrollHeight 173 54 RenderTextControl {TEXTAREA} at (1,3) size 6x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)] 55 RenderBlock {DIV} at (3,3) size 0x169 56 RenderText {#text} at (0,0) size 9x169 57 text run at (0,0) width 7: "o" 58 text run at (0,13) width 7: "n" 59 text run at (0,26) width 7: "e" 60 text run at (0,39) width 0: " " 61 text run at (0,52) width 5: "t" 62 text run at (0,65) width 9: "w" 63 text run at (0,78) width 7: "o" 64 text run at (0,91) width 0: " " 65 text run at (0,104) width 5: "t" 66 text run at (0,117) width 7: "h" 67 text run at (0,130) width 5: "r" 68 text run at (0,143) width 7: "e" 69 text run at (0,156) width 7: "e" 70 layer at (19,106) size 6x32 clip at (0,0) size 0x0 scrollWidth 11 scrollHeight 43 57 71 RenderTextControl {TEXTAREA} at (1,3) size 6x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)] 58 72 RenderBlock {DIV} at (3,3) size 0x39 … … 61 75 text run at (0,13) width 9: "w" 62 76 text run at (0,26) width 7: "o" 63 layer at (2 53,106) size 6x32 clip at (0,0) size 0x0 scrollWidth 9 scrollHeight 6977 layer at (28,106) size 6x32 clip at (0,0) size 0x0 scrollWidth 9 scrollHeight 69 64 78 RenderTextControl {TEXTAREA} at (1,3) size 6x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)] 65 79 RenderBlock {DIV} at (3,3) size 0x65 -
trunk/LayoutTests/platform/mac/fast/replaced/width100percent-textfield-expected.txt
r117673 r151737 10 10 RenderTableSection {TBODY} at (0,0) size 784x27 11 11 RenderTableRow {TR} at (0,1) size 784x25 12 RenderTableCell {TD} at (1,1) size 125x25 [r=0 c=0 rs=1 cs=1] 13 RenderTextControl {INPUT} at (1,3) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 14 RenderTableCell {TD} at (127,1) size 8x25 [r=0 c=1 rs=1 cs=1] 12 RenderTableCell {TD} at (1,1) size 8x25 [r=0 c=0 rs=1 cs=1] 15 13 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 16 RenderTableCell {TD} at (1 36,1) size 8x25 [r=0 c=2rs=1 cs=1]14 RenderTableCell {TD} at (10,1) size 8x25 [r=0 c=1 rs=1 cs=1] 17 15 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 18 RenderTableCell {TD} at (145,3) size 638x20 [r=0 c=3 rs=1 cs=1] 16 RenderTableCell {TD} at (19,1) size 8x25 [r=0 c=2 rs=1 cs=1] 17 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 18 RenderTableCell {TD} at (28,3) size 755x20 [r=0 c=3 rs=1 cs=1] 19 19 RenderText {#text} at (1,1) size 4x18 20 20 text run at (1,1) width 4: " " … … 25 25 RenderTableSection {TBODY} at (0,0) size 784x27 26 26 RenderTableRow {TR} at (0,1) size 784x25 27 RenderTableCell {TD} at (1,1) size 525x25 [r=0 c=0 rs=1 cs=1] 28 RenderTextControl {INPUT} at (1,3) size 523x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 29 RenderTableCell {TD} at (527,1) size 8x25 [r=0 c=1 rs=1 cs=1] 27 RenderTableCell {TD} at (1,1) size 8x25 [r=0 c=0 rs=1 cs=1] 30 28 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 31 RenderTableCell {TD} at ( 536,1) size 8x25 [r=0 c=2rs=1 cs=1]29 RenderTableCell {TD} at (10,1) size 8x25 [r=0 c=1 rs=1 cs=1] 32 30 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 33 RenderTableCell {TD} at (545,3) size 238x20 [r=0 c=3 rs=1 cs=1] 31 RenderTableCell {TD} at (19,1) size 8x25 [r=0 c=2 rs=1 cs=1] 32 RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 33 RenderTableCell {TD} at (28,3) size 755x20 [r=0 c=3 rs=1 cs=1] 34 34 RenderText {#text} at (1,1) size 4x18 35 35 text run at (1,1) width 4: " " 36 layer at (13,33) size 117x1337 RenderBlock {DIV} at (3,3) size 117x1338 RenderText {#text} at (0,0) size 49x1339 text run at (0,0) width 49: "New Mail"40 layer at (13,96) size 517x1341 RenderBlock {DIV} at (3,3) size 517x1342 RenderText {#text} at (0,0) size 49x1343 text run at (0,0) width 49: "New Mail" -
trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug57828-expected.txt
r30635 r151737 4 4 RenderBlock {HTML} at (0,0) size 800x600 5 5 RenderBody {BODY} at (8,8) size 784x584 6 RenderTable {TABLE} at (0,0) size 2 64x54 [border: (3px outset #808080)]7 RenderTableSection {TBODY} at (3,3) size 2 58x488 RenderTableRow {TR} at (0,2) size 2 58x449 RenderTableCell {TD} at (2,2) size 2 54x44 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]6 RenderTable {TABLE} at (0,0) size 221x54 [border: (3px outset #808080)] 7 RenderTableSection {TBODY} at (3,3) size 215x48 8 RenderTableRow {TR} at (0,2) size 215x44 9 RenderTableCell {TD} at (2,2) size 211x44 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 10 10 RenderImage {IMG} at (2,2) size 40x40 11 11 RenderText {#text} at (45,2) size 207x18 … … 13 13 RenderBlock (anonymous) at (0,54) size 784x18 14 14 RenderBR {BR} at (0,0) size 0x18 15 RenderTable {TABLE} at (0,72) size 2 64x54 [border: (3px outset #808080)]16 RenderTableSection {TBODY} at (3,3) size 2 58x4817 RenderTableRow {TR} at (0,2) size 2 58x4418 RenderTableCell {TD} at (2,2) size 2 54x44 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]15 RenderTable {TABLE} at (0,72) size 221x54 [border: (3px outset #808080)] 16 RenderTableSection {TBODY} at (3,3) size 215x48 17 RenderTableRow {TR} at (0,2) size 215x44 18 RenderTableCell {TD} at (2,2) size 211x44 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 19 19 RenderImage {IMG} at (2,2) size 40x40 20 20 RenderText {#text} at (45,2) size 207x18 -
trunk/LayoutTests/platform/qt/fast/css/word-space-extra-expected.txt
r148596 r151737 7 7 RenderText {#text} at (0,0) size 138x28 8 8 text run at (0,0) width 138: "word-spacing" 9 RenderBlock (floating) {PRE} at (0,60) size 1 264x17010 RenderBlock {H3} at (0,15) size 1 264x199 RenderBlock (floating) {PRE} at (0,60) size 1004x170 10 RenderBlock {H3} at (0,15) size 1004x19 11 11 RenderText {#text} at (0,0) size 204x18 12 12 text run at (0,0) width 204: "In a floated pre" 13 RenderBlock (anonymous) at (0,48) size 1 264x12113 RenderBlock (anonymous) at (0,48) size 1004x121 14 14 RenderText {#text} at (0,0) size 260x30 15 15 text run at (0,0) width 0: " " … … 146 146 text run at (1108,105) width 0: " " 147 147 RenderBlock (anonymous) at (0,47) size 769x196 148 RenderBR {BR} at (1 264,0) size 0x19148 RenderBR {BR} at (1004,0) size 0x19 149 149 RenderBlock {PRE} at (0,257) size 769x154 150 150 RenderBlock {H3} at (0,0) size 769x18 … … 450 450 RenderText {#text} at (0,0) size 141x28 451 451 text run at (0,0) width 141: "letter-spacing" 452 RenderBlock (floating) {PRE} at (0,835) size 1 521x170453 RenderBlock {H3} at (0,15) size 1 521x19452 RenderBlock (floating) {PRE} at (0,835) size 1209x170 453 RenderBlock {H3} at (0,15) size 1209x19 454 454 RenderText {#text} at (0,0) size 224x18 455 455 text run at (0,0) width 224: "In a floated pre" 456 RenderBlock (anonymous) at (0,48) size 1 521x121456 RenderBlock (anonymous) at (0,48) size 1209x121 457 457 RenderText {#text} at (0,0) size 286x30 458 458 text run at (0,0) width 0: " " … … 589 589 text run at (1274,105) width 0: " " 590 590 RenderBlock (anonymous) at (0,822) size 769x196 591 RenderBR {BR} at (1 521,0) size 0x19591 RenderBR {BR} at (1209,0) size 0x19 592 592 RenderBlock {PRE} at (0,1032) size 769x154 593 593 RenderBlock {H3} at (0,0) size 769x18 … … 894 894 RenderText {#text} at (0,0) size 131x28 895 895 text run at (0,0) width 131: "both-spacing" 896 RenderBlock (floating) {PRE} at (0,1643) size 2018x169897 RenderBlock {H3} at (0,15) size 2018x19896 RenderBlock (floating) {PRE} at (0,1643) size 1469x169 897 RenderBlock {H3} at (0,15) size 1469x19 898 898 RenderText {#text} at (0,0) size 284x18 899 899 text run at (0,0) width 284: "In a floated pre" 900 RenderBlock (anonymous) at (0,48) size 2018x121900 RenderBlock (anonymous) at (0,48) size 1469x121 901 901 RenderText {#text} at (0,0) size 543x30 902 902 text run at (0,0) width 0: " " … … 1033 1033 text run at (1771,105) width 0: " " 1034 1034 RenderBlock (anonymous) at (0,1630) size 769x195 1035 RenderBR {BR} at ( 2018,0) size 0x191035 RenderBR {BR} at (1469,0) size 0x19 1036 1036 RenderBlock {PRE} at (0,1839) size 769x154 1037 1037 RenderBlock {H3} at (0,0) size 769x18 -
trunk/LayoutTests/platform/qt/fast/replaced/width100percent-image-expected.txt
r142991 r151737 12 12 RenderTableSection {TBODY} at (0,0) size 769x279 13 13 RenderTableRow {TR} at (0,1) size 769x277 14 RenderTableCell {TD} at (1,1) size 2 16x277 [r=0 c=0 rs=1 cs=1]14 RenderTableCell {TD} at (1,1) size 2x277 [r=0 c=0 rs=1 cs=1] 15 15 RenderImage {IMG} at (1,1) size 214x275 16 RenderTableCell {TD} at ( 218,1) size 2x277 [r=0 c=1 rs=1 cs=1]16 RenderTableCell {TD} at (4,1) size 2x277 [r=0 c=1 rs=1 cs=1] 17 17 RenderImage {IMG} at (1,1) size 214x275 18 RenderTableCell {TD} at ( 221,1) size 2x277 [r=0 c=2 rs=1 cs=1]18 RenderTableCell {TD} at (7,1) size 2x277 [r=0 c=2 rs=1 cs=1] 19 19 RenderImage {IMG} at (1,1) size 214x275 20 RenderTableCell {TD} at ( 224,129) size 544x21 [r=0 c=3 rs=1 cs=1]20 RenderTableCell {TD} at (10,129) size 758x21 [r=0 c=3 rs=1 cs=1] 21 21 RenderText {#text} at (1,1) size 4x19 22 22 text run at (1,1) width 4: " " -
trunk/LayoutTests/platform/qt/fast/replaced/width100percent-searchfield-expected.txt
r148596 r151737 1 layer at (0,0) size 945x5852 RenderView at (0,0) size 800x 5853 layer at (0,0) size 800x 5854 RenderBlock {HTML} at (0,0) size 800x 5855 RenderBody {BODY} at (8,8) size 784x5 691 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 6 RenderBlock (anonymous) at (0,0) size 784x19 7 7 RenderText {#text} at (0,0) size 212x19 … … 10 10 RenderTableSection {TBODY} at (0,0) size 784x31 11 11 RenderTableRow {TR} at (0,1) size 784x29 12 RenderTableCell {TD} at (1,1) size 194x29 [r=0 c=0 rs=1 cs=1] 13 RenderTextControl {INPUT} at (1,3) size 192x23 14 RenderFlexibleBox {DIV} at (2,2) size 188x19 15 RenderBlock {DIV} at (0,9) size 0x1 16 RenderBlock {DIV} at (0,0) size 177x19 17 RenderBlock {DIV} at (177,4) size 11x11 18 RenderTableCell {TD} at (196,1) size 6x29 [r=0 c=1 rs=1 cs=1] 12 RenderTableCell {TD} at (1,1) size 6x29 [r=0 c=0 rs=1 cs=1] 19 13 RenderTextControl {INPUT} at (1,3) size 4x23 20 14 RenderFlexibleBox {DIV} at (2,2) size 0x19 … … 22 16 RenderBlock {DIV} at (0,0) size 0x19 23 17 RenderBlock {DIV} at (0,4) size 11x11 24 RenderTableCell {TD} at ( 203,1) size 6x29 [r=0 c=2rs=1 cs=1]18 RenderTableCell {TD} at (8,1) size 6x29 [r=0 c=1 rs=1 cs=1] 25 19 RenderTextControl {INPUT} at (1,3) size 4x23 26 20 RenderFlexibleBox {DIV} at (2,2) size 0x19 … … 28 22 RenderBlock {DIV} at (0,0) size 0x19 29 23 RenderBlock {DIV} at (0,4) size 11x11 30 RenderTableCell {TD} at (210,5) size 573x21 [r=0 c=3 rs=1 cs=1] 24 RenderTableCell {TD} at (15,1) size 6x29 [r=0 c=2 rs=1 cs=1] 25 RenderTextControl {INPUT} at (1,3) size 4x23 26 RenderFlexibleBox {DIV} at (2,2) size 0x19 27 RenderBlock {DIV} at (0,9) size 0x1 28 RenderBlock {DIV} at (0,0) size 0x19 29 RenderBlock {DIV} at (0,4) size 11x11 30 RenderTableCell {TD} at (22,5) size 761x21 [r=0 c=3 rs=1 cs=1] 31 31 RenderText {#text} at (1,1) size 4x19 32 32 text run at (1,1) width 4: " " … … 34 34 RenderBR {BR} at (0,0) size 0x19 35 35 RenderBR {BR} at (0,19) size 0x19 36 RenderTable {TABLE} at (0,88) size 937x31 37 RenderTableSection {TBODY} at (0,0) size 937x31 38 RenderTableRow {TR} at (0,1) size 937x29 39 RenderTableCell {TD} at (1,1) size 914x29 [r=0 c=0 rs=1 cs=1] 40 RenderTextControl {INPUT} at (1,3) size 912x23 41 RenderFlexibleBox {DIV} at (2,2) size 908x19 42 RenderBlock {DIV} at (0,9) size 0x1 43 RenderBlock {DIV} at (0,0) size 897x19 44 RenderBlock {DIV} at (897,4) size 11x11 45 RenderTableCell {TD} at (916,1) size 6x29 [r=0 c=1 rs=1 cs=1] 36 RenderTable {TABLE} at (0,88) size 784x31 37 RenderTableSection {TBODY} at (0,0) size 784x31 38 RenderTableRow {TR} at (0,1) size 784x29 39 RenderTableCell {TD} at (1,1) size 6x29 [r=0 c=0 rs=1 cs=1] 46 40 RenderTextControl {INPUT} at (1,3) size 4x23 47 41 RenderFlexibleBox {DIV} at (2,2) size 0x19 … … 49 43 RenderBlock {DIV} at (0,0) size 0x19 50 44 RenderBlock {DIV} at (0,4) size 11x11 51 RenderTableCell {TD} at ( 923,1) size 6x29 [r=0 c=2rs=1 cs=1]45 RenderTableCell {TD} at (8,1) size 6x29 [r=0 c=1 rs=1 cs=1] 52 46 RenderTextControl {INPUT} at (1,3) size 4x23 53 47 RenderFlexibleBox {DIV} at (2,2) size 0x19 … … 55 49 RenderBlock {DIV} at (0,0) size 0x19 56 50 RenderBlock {DIV} at (0,4) size 11x11 57 RenderTableCell {TD} at (930,5) size 6x21 [r=0 c=3 rs=1 cs=1] 51 RenderTableCell {TD} at (15,1) size 6x29 [r=0 c=2 rs=1 cs=1] 52 RenderTextControl {INPUT} at (1,3) size 4x23 53 RenderFlexibleBox {DIV} at (2,2) size 0x19 54 RenderBlock {DIV} at (0,9) size 0x1 55 RenderBlock {DIV} at (0,0) size 0x19 56 RenderBlock {DIV} at (0,4) size 11x11 57 RenderTableCell {TD} at (22,5) size 761x21 [r=0 c=3 rs=1 cs=1] 58 58 RenderText {#text} at (1,1) size 4x19 59 59 text run at (1,1) width 4: " " 60 layer at (12,33) size 177x1961 RenderBlock {DIV} at (0,0) size 177x1962 RenderText {#text} at (0,0) size 61x1963 text run at (0,0) width 61: "New Mail"64 layer at (12,102) size 897x1965 RenderBlock {DIV} at (0,0) size 897x1966 RenderText {#text} at (0,0) size 61x1967 text run at (0,0) width 61: "New Mail" -
trunk/LayoutTests/platform/qt/fast/replaced/width100percent-textfield-expected.txt
r130286 r151737 1 layer at (0,0) size 945x5852 RenderView at (0,0) size 800x 5853 layer at (0,0) size 800x 5854 RenderBlock {HTML} at (0,0) size 800x 5855 RenderBody {BODY} at (8,8) size 784x5 691 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 6 RenderBlock (anonymous) at (0,0) size 784x19 7 7 RenderText {#text} at (0,0) size 212x19 … … 10 10 RenderTableSection {TBODY} at (0,0) size 784x31 11 11 RenderTableRow {TR} at (0,1) size 784x29 12 RenderTableCell {TD} at (1,1) size 194x29 [r=0 c=0 rs=1 cs=1] 13 RenderTextControl {INPUT} at (1,3) size 192x23 14 RenderTableCell {TD} at (196,1) size 6x29 [r=0 c=1 rs=1 cs=1] 12 RenderTableCell {TD} at (1,1) size 6x29 [r=0 c=0 rs=1 cs=1] 15 13 RenderTextControl {INPUT} at (1,3) size 4x23 16 RenderTableCell {TD} at ( 203,1) size 6x29 [r=0 c=2rs=1 cs=1]14 RenderTableCell {TD} at (8,1) size 6x29 [r=0 c=1 rs=1 cs=1] 17 15 RenderTextControl {INPUT} at (1,3) size 4x23 18 RenderTableCell {TD} at (210,5) size 573x21 [r=0 c=3 rs=1 cs=1] 16 RenderTableCell {TD} at (15,1) size 6x29 [r=0 c=2 rs=1 cs=1] 17 RenderTextControl {INPUT} at (1,3) size 4x23 18 RenderTableCell {TD} at (22,5) size 761x21 [r=0 c=3 rs=1 cs=1] 19 19 RenderText {#text} at (1,1) size 4x19 20 20 text run at (1,1) width 4: " " … … 22 22 RenderBR {BR} at (0,0) size 0x19 23 23 RenderBR {BR} at (0,19) size 0x19 24 RenderTable {TABLE} at (0,88) size 937x31 25 RenderTableSection {TBODY} at (0,0) size 937x31 26 RenderTableRow {TR} at (0,1) size 937x29 27 RenderTableCell {TD} at (1,1) size 914x29 [r=0 c=0 rs=1 cs=1] 28 RenderTextControl {INPUT} at (1,3) size 912x23 29 RenderTableCell {TD} at (916,1) size 6x29 [r=0 c=1 rs=1 cs=1] 24 RenderTable {TABLE} at (0,88) size 784x31 25 RenderTableSection {TBODY} at (0,0) size 784x31 26 RenderTableRow {TR} at (0,1) size 784x29 27 RenderTableCell {TD} at (1,1) size 6x29 [r=0 c=0 rs=1 cs=1] 30 28 RenderTextControl {INPUT} at (1,3) size 4x23 31 RenderTableCell {TD} at ( 923,1) size 6x29 [r=0 c=2rs=1 cs=1]29 RenderTableCell {TD} at (8,1) size 6x29 [r=0 c=1 rs=1 cs=1] 32 30 RenderTextControl {INPUT} at (1,3) size 4x23 33 RenderTableCell {TD} at (930,5) size 6x21 [r=0 c=3 rs=1 cs=1] 31 RenderTableCell {TD} at (15,1) size 6x29 [r=0 c=2 rs=1 cs=1] 32 RenderTextControl {INPUT} at (1,3) size 4x23 33 RenderTableCell {TD} at (22,5) size 761x21 [r=0 c=3 rs=1 cs=1] 34 34 RenderText {#text} at (1,1) size 4x19 35 35 text run at (1,1) width 4: " " 36 layer at (12,33) size 188x1937 RenderBlock {DIV} at (2,2) size 188x1938 RenderText {#text} at (0,0) size 61x1939 text run at (0,0) width 61: "New Mail"40 layer at (12,102) size 908x1941 RenderBlock {DIV} at (2,2) size 908x1942 RenderText {#text} at (0,0) size 61x1943 text run at (0,0) width 61: "New Mail" -
trunk/LayoutTests/platform/qt/tables/mozilla/bugs/bug57828-expected.txt
r122719 r151737 4 4 RenderBlock {HTML} at (0,0) size 800x600 5 5 RenderBody {BODY} at (8,8) size 784x584 6 RenderTable {TABLE} at (0,0) size 2 53x54 [border: (3px outset #808080)]7 RenderTableSection {TBODY} at (3,3) size 2 47x488 RenderTableRow {TR} at (0,2) size 2 47x449 RenderTableCell {TD} at (2,2) size 2 43x44 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]6 RenderTable {TABLE} at (0,0) size 210x54 [border: (3px outset #808080)] 7 RenderTableSection {TBODY} at (3,3) size 204x48 8 RenderTableRow {TR} at (0,2) size 204x44 9 RenderTableCell {TD} at (2,2) size 200x44 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 10 10 RenderImage {IMG} at (2,2) size 40x40 11 11 RenderText {#text} at (45,2) size 196x19 … … 13 13 RenderBlock (anonymous) at (0,54) size 784x19 14 14 RenderBR {BR} at (0,0) size 0x19 15 RenderTable {TABLE} at (0,73) size 2 53x54 [border: (3px outset #808080)]16 RenderTableSection {TBODY} at (3,3) size 2 47x4817 RenderTableRow {TR} at (0,2) size 2 47x4418 RenderTableCell {TD} at (2,2) size 2 43x44 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]15 RenderTable {TABLE} at (0,73) size 210x54 [border: (3px outset #808080)] 16 RenderTableSection {TBODY} at (3,3) size 204x48 17 RenderTableRow {TR} at (0,2) size 204x44 18 RenderTableCell {TD} at (2,2) size 200x44 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 19 19 RenderImage {IMG} at (2,2) size 40x40 20 20 RenderText {#text} at (45,2) size 196x19 -
trunk/Source/WebCore/ChangeLog
r151736 r151737 1 2013-06-19 Robert Hogan <robert@webkit.org> 2 3 Incorrect computation of shrink-to-fit width for block with white-space:nowrap and floating children 4 https://bugs.webkit.org/show_bug.cgi?id=114879 5 6 Reviewed by David Hyatt. 7 Per http://www.w3.org/TR/CSS21/visudet.html#Computing_widths_and_margins when width is auto then floating non-replaced, 8 absolute non-replaced, and inline-block non-replaced elements should use shrink-to-fit width. This trumps any no-wrap property 9 on the element so if we are shrinking to fit ensure our minimum width respects all possible line breaks. 10 11 Test: fast/block/shrink-to-fit-width-container-with-floating-children.html 12 13 * rendering/RenderBlock.cpp: 14 (WebCore::RenderBlock::computeIntrinsicLogicalWidths): 15 1 16 2013-06-19 Christophe Dumez <ch.dumez@sisa.samsung.com> 2 17 -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r151662 r151737 5890 5890 5891 5891 if (!style()->autoWrap() && childrenInline()) { 5892 minLogicalWidth = maxLogicalWidth;5893 5892 // A horizontal marquee with inline children has no minimum width. 5894 5893 if (layer() && layer()->marquee() && layer()->marquee()->isHorizontal())
Note: See TracChangeset
for help on using the changeset viewer.