Changeset 47255 in webkit
- Timestamp:
- Aug 13, 2009 5:40:12 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 8 added
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r47254 r47255 1 2009-08-13 Dan Bernstein <mitz@apple.com> 2 3 Reviewed by Simon Fraser. 4 5 misalignment because of float:left of <div> tag 6 https://bugs.webkit.org/show_bug.cgi?id=15869 7 8 One section of http://edgar.sec.gov site draws to the right of the rest 9 of the content 10 <rdar://problem/7135951> 11 12 * fast/block/float/avoidance-percent-width-compat.html: Added. 13 * fast/block/float/avoidance-percent-width-strict.html: Added. 14 * platform/mac/fast/block/float/035-expected.checksum: 15 * platform/mac/fast/block/float/035-expected.png: 16 * platform/mac/fast/block/float/035-expected.txt: 17 * platform/mac/fast/block/float/avoidance-percent-width-compat-expected.checksum: Added. 18 * platform/mac/fast/block/float/avoidance-percent-width-compat-expected.png: Added. 19 * platform/mac/fast/block/float/avoidance-percent-width-compat-expected.txt: Added. 20 * platform/mac/fast/block/float/avoidance-percent-width-strict-expected.checksum: Added. 21 * platform/mac/fast/block/float/avoidance-percent-width-strict-expected.png: Added. 22 * platform/mac/fast/block/float/avoidance-percent-width-strict-expected.txt: Added. 23 * platform/mac/fast/block/float/float-avoidance-expected.checksum: 24 * platform/mac/fast/block/float/float-avoidance-expected.png: 25 * platform/mac/fast/block/float/float-avoidance-expected.txt: 26 * platform/mac/fast/overflow/004-expected.checksum: 27 * platform/mac/fast/overflow/004-expected.png: 28 * platform/mac/fast/overflow/004-expected.txt: 29 * platform/mac/tables/mozilla/bugs/bug106158-1-expected.checksum: 30 * platform/mac/tables/mozilla/bugs/bug106158-1-expected.png: 31 * platform/mac/tables/mozilla/bugs/bug106158-1-expected.txt: 32 * platform/mac/tables/mozilla/bugs/bug106158-2-expected.checksum: 33 * platform/mac/tables/mozilla/bugs/bug106158-2-expected.png: 34 * platform/mac/tables/mozilla/bugs/bug106158-2-expected.txt: 35 1 36 2009-08-13 Eric Seidel <eric@webkit.org> 2 37 -
trunk/LayoutTests/platform/mac/fast/block/float/035-expected.checksum
r38121 r47255 1 d975c001de9476347c2d1168ea94a4e7 1 35051258731f368ef14b63a8254ba5cc -
trunk/LayoutTests/platform/mac/fast/block/float/035-expected.txt
r25970 r47255 1 layer at (0,0) size 800x6002 RenderView at (0,0) size 800x6003 layer at (0,0) size 800x6004 RenderBlock {HTML} at (0,0) size 800x6005 RenderBody {BODY} at (8,8) size 7 84x5846 RenderBlock (floating) {DIV} at (0,0) size 673x 520 [border: (10px solid #0000FF)]1 layer at (0,0) size 785x828 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x828 4 RenderBlock {HTML} at (0,0) size 785x600 5 RenderBody {BODY} at (8,8) size 769x584 6 RenderBlock (floating) {DIV} at (0,0) size 673x820 [border: (10px solid #0000FF)] 7 7 RenderImage {IMG} at (10,10) size 300x300 [bgcolor=#008000] 8 RenderImage {IMG} at ( 163,10) size 500x500 [bgcolor=#800080]8 RenderImage {IMG} at (-140,310) size 500x500 [bgcolor=#800080] -
trunk/LayoutTests/platform/mac/fast/block/float/float-avoidance-expected.checksum
r38121 r47255 1 daf506163454bd4c5c8f2447480f3cd8 1 bfd1d9cca70442a55191d87cfc24332b -
trunk/LayoutTests/platform/mac/fast/block/float/float-avoidance-expected.txt
r30635 r47255 1 layer at (0,0) size 785x23 321 layer at (0,0) size 785x2368 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x23 324 RenderBlock {HTML} at (0,0) size 785x23 325 RenderBody {BODY} at (8,8) size 769x23 163 layer at (0,0) size 785x2368 4 RenderBlock {HTML} at (0,0) size 785x2368 5 RenderBody {BODY} at (8,8) size 769x2352 6 6 RenderBlock (anonymous) at (0,0) size 769x36 7 7 RenderText {#text} at (0,0) size 765x36 … … 130 130 text run at (0,0) width 578: "The block-level table below has a percentage width and should still be even with the select. " 131 131 text run at (578,0) width 152: "It spills out of the block." 132 RenderBlock {P} at (0,898) size 220x1 22[border: (10px solid #FF0000)]133 RenderBlock (anonymous) at (10,10) size 200x18 134 RenderText {#text} at (0,0) size 60x18 135 text run at (0,0) width 60: "Line One" 136 RenderBR {BR} at (60,14) size 0x0 137 RenderMenuList {SELECT} at (0,20) size 100x18 [bgcolor=#FFFFFF] 138 RenderBlock (anonymous) at (0,0) size 100x18 139 RenderText at (8,2) size 22x13 140 text run at (8,2) width 22: "One" 141 RenderText {#text} at (0,0) size 0x0 142 RenderTable {TABLE} at (1 10,28) size 200x66 [border: (2px outset #808080)]132 RenderBlock {P} at (0,898) size 220x144 [border: (10px solid #FF0000)] 133 RenderBlock (anonymous) at (10,10) size 200x18 134 RenderText {#text} at (0,0) size 60x18 135 text run at (0,0) width 60: "Line One" 136 RenderBR {BR} at (60,14) size 0x0 137 RenderMenuList {SELECT} at (0,20) size 100x18 [bgcolor=#FFFFFF] 138 RenderBlock (anonymous) at (0,0) size 100x18 139 RenderText at (8,2) size 22x13 140 text run at (8,2) width 22: "One" 141 RenderText {#text} at (0,0) size 0x0 142 RenderTable {TABLE} at (10,50) size 200x66 [border: (2px outset #808080)] 143 143 RenderTableSection {TBODY} at (2,2) size 196x62 144 144 RenderTableRow {TR} at (0,2) size 196x58 … … 148 148 text run at (2,20) width 161: "shrink so it can be next to" 149 149 text run at (2,38) width 90: "previous float." 150 RenderBlock (anonymous) at (10, 94) size 200x18151 RenderBR {BR} at (0,0) size 0x18 152 RenderBlock (anonymous) at (0,10 36) size 769x18150 RenderBlock (anonymous) at (10,116) size 200x18 151 RenderBR {BR} at (0,0) size 0x18 152 RenderBlock (anonymous) at (0,1058) size 769x18 153 153 RenderText {#text} at (0,0) size 743x18 154 154 text run at (0,0) width 545: "The block-level table below has an auto width and should still be even with the select. " 155 155 text run at (545,0) width 198: "It shrinks to fit inside the block." 156 RenderBlock {P} at (0,10 70) size 220x176 [border: (10px solid #FF0000)]156 RenderBlock {P} at (0,1092) size 220x176 [border: (10px solid #FF0000)] 157 157 RenderBlock (anonymous) at (10,10) size 200x18 158 158 RenderText {#text} at (0,0) size 60x18 … … 177 177 RenderBlock (anonymous) at (10,148) size 200x18 178 178 RenderBR {BR} at (0,0) size 0x18 179 RenderBlock (anonymous) at (0,12 62) size 769x18179 RenderBlock (anonymous) at (0,1284) size 769x18 180 180 RenderText {#text} at (0,0) size 538x18 181 181 text run at (0,0) width 538: "The floating overflow section with a percentage width should be even with the select." 182 RenderBlock {DIV} at (0,1 280) size 220x146 [border: (10px solid #FF0000)]182 RenderBlock {DIV} at (0,1302) size 220x146 [border: (10px solid #FF0000)] 183 183 RenderText {#text} at (10,10) size 60x18 184 184 text run at (10,10) width 60: "Line One" … … 191 191 RenderText {#text} at (0,0) size 0x0 192 192 RenderBR {BR} at (210,28) size 0x18 193 RenderBlock (anonymous) at (0,14 26) size 769x36193 RenderBlock (anonymous) at (0,1448) size 769x36 194 194 RenderText {#text} at (0,0) size 728x36 195 195 text run at (0,0) width 728: "The floating overflow section with an auto width should be even with the select and shrinks to use the available line" 196 196 text run at (0,18) width 268: "width. THIS IS CURRENTLY BUGGY." 197 RenderBlock {DIV} at (0,14 62) size 220x114 [border: (10px solid #FF0000)]197 RenderBlock {DIV} at (0,1484) size 220x114 [border: (10px solid #FF0000)] 198 198 RenderText {#text} at (10,10) size 60x18 199 199 text run at (10,10) width 60: "Line One" … … 206 206 RenderText {#text} at (0,0) size 0x0 207 207 RenderBR {BR} at (110,28) size 0x18 208 RenderBlock (anonymous) at (0,15 76) size 769x18208 RenderBlock (anonymous) at (0,1598) size 769x18 209 209 RenderText {#text} at (0,0) size 649x18 210 210 text run at (0,0) width 649: "The block-level overflow section below has a percentage width and should still be even with the select." 211 RenderBlock {DIV} at (0,1 594) size 220x164 [border: (10px solid #FF0000)]211 RenderBlock {DIV} at (0,1616) size 220x164 [border: (10px solid #FF0000)] 212 212 RenderBlock (anonymous) at (10,10) size 200x18 213 213 RenderText {#text} at (0,0) size 60x18 … … 221 221 RenderBlock (anonymous) at (10,136) size 200x18 222 222 RenderBR {BR} at (0,0) size 0x18 223 RenderBlock (anonymous) at (0,17 58) size 769x36223 RenderBlock (anonymous) at (0,1780) size 769x36 224 224 RenderText {#text} at (0,0) size 752x36 225 225 text run at (0,0) width 620: "The block-level overflow section below has an auto width and should still be even with the select. " 226 226 text run at (620,0) width 132: "It shrinks to fit inside" 227 227 text run at (0,18) width 62: "the block." 228 RenderBlock {DIV} at (0,1 794) size 220x164 [border: (10px solid #FF0000)]228 RenderBlock {DIV} at (0,1816) size 220x164 [border: (10px solid #FF0000)] 229 229 RenderBlock (anonymous) at (10,10) size 200x18 230 230 RenderText {#text} at (0,0) size 60x18 … … 238 238 RenderBlock (anonymous) at (10,136) size 200x18 239 239 RenderBR {BR} at (0,0) size 0x18 240 RenderBlock (anonymous) at (0,19 58) size 769x18240 RenderBlock (anonymous) at (0,1980) size 769x18 241 241 RenderText {#text} at (0,0) size 446x18 242 242 text run at (0,0) width 446: "The floating hr with a percentage width should be even with the select." 243 RenderBlock {DIV} at (0,19 76) size 220x60 [border: (10px solid #FF0000)]243 RenderBlock {DIV} at (0,1998) size 220x60 [border: (10px solid #FF0000)] 244 244 RenderText {#text} at (10,10) size 60x18 245 245 text run at (10,10) width 60: "Line One" … … 253 253 RenderText {#text} at (0,0) size 0x0 254 254 RenderBR {BR} at (196,28) size 0x18 255 RenderBlock (anonymous) at (0,20 36) size 769x36255 RenderBlock (anonymous) at (0,2058) size 769x36 256 256 RenderText {#text} at (0,0) size 750x36 257 257 text run at (0,0) width 750: "The floating hr below should still be even with the select and shrinks to use its intrinsic width (which is basically like 1-" 258 258 text run at (0,18) width 33: "2px)." 259 RenderBlock {DIV} at (0,20 72) size 220x60 [border: (10px solid #FF0000)]259 RenderBlock {DIV} at (0,2094) size 220x60 [border: (10px solid #FF0000)] 260 260 RenderText {#text} at (10,10) size 60x18 261 261 text run at (10,10) width 60: "Line One" … … 269 269 RenderText {#text} at (0,0) size 0x0 270 270 RenderBR {BR} at (116,28) size 0x18 271 RenderBlock (anonymous) at (0,21 32) size 769x18271 RenderBlock (anonymous) at (0,2154) size 769x18 272 272 RenderText {#text} at (0,0) size 557x18 273 273 text run at (0,0) width 557: "The block-level hr below has a percentage width and should still be even with the select." 274 RenderBlock {DIV} at (0,21 50) size 220x74[border: (10px solid #FF0000)]275 RenderBlock (anonymous) at (10,10) size 200x18 276 RenderText {#text} at (0,0) size 60x18 277 text run at (0,0) width 60: "Line One" 278 RenderBR {BR} at (60,14) size 0x0 279 RenderMenuList {SELECT} at (0,20) size 100x18 [bgcolor=#FFFFFF] 280 RenderBlock (anonymous) at (0,0) size 100x18 281 RenderText at (8,2) size 22x13 282 text run at (8,2) width 22: "One" 283 RenderText {#text} at (0,0) size 0x0 284 RenderBlock {HR} at (1 10,36) size 202x2 [border: (1px inset #000000)]285 RenderBlock (anonymous) at (10, 46) size 200x18286 RenderBR {BR} at ( 100,0) size 0x18287 RenderBlock (anonymous) at (0,22 24) size 769x18274 RenderBlock {DIV} at (0,2172) size 220x88 [border: (10px solid #FF0000)] 275 RenderBlock (anonymous) at (10,10) size 200x18 276 RenderText {#text} at (0,0) size 60x18 277 text run at (0,0) width 60: "Line One" 278 RenderBR {BR} at (60,14) size 0x0 279 RenderMenuList {SELECT} at (0,20) size 100x18 [bgcolor=#FFFFFF] 280 RenderBlock (anonymous) at (0,0) size 100x18 281 RenderText at (8,2) size 22x13 282 text run at (8,2) width 22: "One" 283 RenderText {#text} at (0,0) size 0x0 284 RenderBlock {HR} at (10,50) size 202x2 [border: (1px inset #000000)] 285 RenderBlock (anonymous) at (10,60) size 200x18 286 RenderBR {BR} at (0,0) size 0x18 287 RenderBlock (anonymous) at (0,2260) size 769x18 288 288 RenderText {#text} at (0,0) size 623x18 289 289 text run at (0,0) width 528: "The block-level hr below has an auto width and should still be even with the select. " 290 290 text run at (528,0) width 95: "It shrinks to fit." 291 RenderBlock {DIV} at (0,22 42) size 220x74 [border: (10px solid #FF0000)]291 RenderBlock {DIV} at (0,2278) size 220x74 [border: (10px solid #FF0000)] 292 292 RenderBlock (anonymous) at (10,10) size 200x18 293 293 RenderText {#text} at (0,0) size 60x18 … … 302 302 RenderBlock (anonymous) at (10,46) size 200x18 303 303 RenderBR {BR} at (100,0) size 0x18 304 layer at (118,13 16) size 100x108304 layer at (118,1338) size 100x108 305 305 RenderBlock (floating) {DIV} at (110,28) size 100x108 306 306 RenderText {#text} at (0,0) size 98x108 … … 311 311 text run at (0,72) width 98: "have to wrap to" 312 312 text run at (0,90) width 88: "multiple lines." 313 layer at (18,15 20) size 200x54313 layer at (18,1542) size 200x54 314 314 RenderBlock (floating) {DIV} at (10,50) size 200x54 315 315 RenderText {#text} at (0,0) size 172x54 … … 317 317 text run at (0,18) width 172: "with enough text to have to" 318 318 text run at (0,36) width 140: "wrap to multiple lines." 319 layer at (118,16 30) size 100x108319 layer at (118,1652) size 100x108 320 320 RenderBlock {DIV} at (110,28) size 100x108 321 321 RenderText {#text} at (0,0) size 98x108 … … 326 326 text run at (0,72) width 98: "have to wrap to" 327 327 text run at (0,90) width 88: "multiple lines." 328 layer at (118,18 30) size 100x108328 layer at (118,1852) size 100x108 329 329 RenderBlock {DIV} at (110,28) size 100x108 330 330 RenderText {#text} at (0,0) size 98x108 -
trunk/LayoutTests/platform/mac/fast/overflow/004-expected.checksum
r41742 r47255 1 565185230b519cff00aa40ec0770d6ce 1 e31e1d829e8e8eb8e45f513ce4833f87 -
trunk/LayoutTests/platform/mac/fast/overflow/004-expected.txt
r25970 r47255 1 layer at (0,0) size 800x6002 RenderView at (0,0) size 800x6003 layer at (0,0) size 800x5364 RenderBlock {HTML} at (0,0) size 800x5365 RenderBody {BODY} at (8,8) size 7 84x5206 RenderBlock (anonymous) at (0,0) size 7 84x181 layer at (0,0) size 785x1038 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x1038 4 RenderBlock {HTML} at (0,0) size 785x1038 5 RenderBody {BODY} at (8,8) size 769x1022 6 RenderBlock (anonymous) at (0,0) size 769x18 7 7 RenderText {#text} at (0,0) size 704x18 8 8 text run at (0,0) width 704: "The two green blocks below should be identical and should each take up half the width of the browser window." 9 RenderBlock (floating) {DIV} at (3 90,18) size 394x502 [bgcolor=#008000] [border: (1px solid #000000)]9 RenderBlock (floating) {DIV} at (383,18) size 386x502 [bgcolor=#008000] [border: (1px solid #000000)] 10 10 RenderText {#text} at (0,0) size 0x0 11 layer at (8, 26) size 394x502 clip at (9,27) size 392x50012 RenderBlock {DIV} at (0, 18) size 394x502 [bgcolor=#008000] [border: (1px solid #000000)]11 layer at (8,528) size 386x502 clip at (9,529) size 384x500 12 RenderBlock {DIV} at (0,520) size 386x502 [bgcolor=#008000] [border: (1px solid #000000)] -
trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug106158-1-expected.checksum
r38297 r47255 1 c 8b22fdb435cc00102e3e207597cbeaa1 c1a464e8b692d557d7a634cc3a8288ec -
trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug106158-1-expected.txt
r30635 r47255 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 450x 78[border: (1px solid #000000)]7 RenderTableSection {TBODY} at (1,1) size 448x 768 RenderTableRow {TR} at (0,2) size 448x 729 RenderTableCell {TD} at (2,2) size 444x 72[r=0 c=0 rs=1 cs=1]6 RenderTable {TABLE} at (0,0) size 450x104 [border: (1px solid #000000)] 7 RenderTableSection {TBODY} at (1,1) size 448x102 8 RenderTableRow {TR} at (0,2) size 448x98 9 RenderTableCell {TD} at (2,2) size 444x98 [r=0 c=0 rs=1 cs=1] 10 10 RenderTable {TABLE} at (1,1) size 442x26 [border: (1px solid #FF0000)] 11 11 RenderTableSection {TBODY} at (1,1) size 440x24 … … 14 14 RenderText {#text} at (1,1) size 21x18 15 15 text run at (1,1) width 21: "test" 16 RenderTable {TABLE} at (1, 1) size 437x70 [border: (1px solid #000000)]16 RenderTable {TABLE} at (1,27) size 437x70 [border: (1px solid #000000)] 17 17 RenderTableSection {TBODY} at (1,1) size 435x68 18 18 RenderTableRow {TR} at (0,2) size 435x64 -
trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug106158-2-expected.checksum
r38297 r47255 1 d3d75fbf7f441f74156649b198a8a6e1 1 60accaae9969e2afacc27bdb6f2f6308 -
trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug106158-2-expected.txt
r30635 r47255 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 450x4 87 RenderTableSection {TBODY} at (0,0) size 450x4 88 RenderTableRow {TR} at (0,2) size 450x4 49 RenderTableCell {TD} at (2,2) size 446x4 4[r=0 c=0 rs=1 cs=1]6 RenderTable {TABLE} at (0,0) size 450x49 7 RenderTableSection {TBODY} at (0,0) size 450x49 8 RenderTableRow {TR} at (0,2) size 450x45 9 RenderTableCell {TD} at (2,2) size 446x45 [r=0 c=0 rs=1 cs=1] 10 10 RenderBlock (anonymous) at (1,1) size 444x18 11 11 RenderTable {TABLE} at (0,0) size 444x19 [bgcolor=#FFFF00] … … 18 18 RenderText {#text} at (0,0) size 0x0 19 19 RenderBR {BR} at (0,0) size 0x18 20 RenderTable {TABLE} at (1, 19) size 439x24 [bgcolor=#FF00FF]20 RenderTable {TABLE} at (1,20) size 439x24 [bgcolor=#FF00FF] 21 21 RenderTableSection {TBODY} at (0,0) size 439x24 22 22 RenderTableRow {TR} at (0,2) size 439x20 -
trunk/WebCore/ChangeLog
r47252 r47255 1 2009-08-13 Dan Bernstein <mitz@apple.com> 2 3 Reviewed by Simon Fraser. 4 5 misalignment because of float:left of <div> tag 6 https://bugs.webkit.org/show_bug.cgi?id=15869 7 8 One section of http://edgar.sec.gov site draws to the right of the rest 9 of the content 10 <rdar://problem/7135951> 11 12 Tests: fast/block/float/avoidance-percent-width-compat.html 13 fast/block/float/avoidance-percent-width-strict.html 14 15 * rendering/RenderBlock.cpp: 16 (WebCore::RenderBlock::getClearDelta): Changed to apply the same float 17 avoidance logic in strict mode and in compatibility mode, which 18 matches Firefox and IE. Changed to compute and use the computed 19 width of the child, instead of ignoring non-fixed widths. 20 1 21 2009-08-13 Steve Block <steveblock@google.com> 2 22 -
trunk/WebCore/rendering/RenderBlock.cpp
r47200 r47255 3282 3282 // FIXME: Note that the remaining space checks aren't quite accurate, since you should be able to clear only some floats (the minimum # needed 3283 3283 // to fit) and not all (we should be using nextFloatBottomBelow and looping). 3284 // Do not allow tables to wrap in quirks or even in almost strict mode3285 // (ebay on the PLT, finance.yahoo.com in the real world, versiontracker.com forces even almost strict mode not to work)3286 3284 int result = clearSet ? max(0, bottom - yPos) : 0; 3287 if (!result && child->avoidsFloats() && child->style()->width().isFixed() && 3288 child->minPrefWidth() > lineWidth(yPos, false) && child->minPrefWidth() <= availableWidth() && 3289 document()->inStrictMode()) 3290 result = max(0, floatBottom() - yPos); 3285 if (!result && child->avoidsFloats()) { 3286 int oldYPos = child->y(); 3287 int oldWidth = child->width(); 3288 child->setY(yPos); 3289 child->calcWidth(); 3290 if (child->width() > lineWidth(yPos, false) && child->minPrefWidth() <= availableWidth()) 3291 result = max(0, floatBottom() - yPos); 3292 child->setY(oldYPos); 3293 child->setWidth(oldWidth); 3294 } 3291 3295 return result; 3292 3296 }
Note: See TracChangeset
for help on using the changeset viewer.