Changeset 25011 in webkit
- Timestamp:
- Aug 11, 2007 11:01:35 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 34 added
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r25010 r25011 1 2007-08-11 Mitz Pettel <mitz@webkit.org> 2 3 Reviewed by Darin. 4 5 - tests and updated results for http://bugs.webkit.org/show_bug.cgi?id=13670 6 <rdar://problem/5399619> Table misrender when one of the TDs has width=100% 7 8 * fast/table/100-percent-cell-width-expected.checksum: Added. 9 * fast/table/100-percent-cell-width-expected.png: Added. 10 * fast/table/100-percent-cell-width-expected.txt: Added. 11 * fast/table/100-percent-cell-width.html: Added. 12 * fast/table/percent-widths-stretch-expected.checksum: Added. 13 * fast/table/percent-widths-stretch-expected.png: Added. 14 * fast/table/percent-widths-stretch-expected.txt: Added. 15 * fast/table/percent-widths-stretch.html: Added. 16 * fast/text/whitespace/026-expected.checksum: 17 * fast/text/whitespace/026-expected.png: 18 * fast/text/whitespace/026-expected.txt: 19 * tables/mozilla/bugs/bug35662-expected.checksum: 20 * tables/mozilla/bugs/bug35662-expected.png: 21 * tables/mozilla/bugs/bug35662-expected.txt: 22 * tables/mozilla/bugs/bug5799-expected.checksum: 23 * tables/mozilla/bugs/bug5799-expected.png: 24 * tables/mozilla/bugs/bug5799-expected.txt: 25 * tables/mozilla/core/col_span-expected.checksum: 26 * tables/mozilla/core/col_span-expected.png: 27 * tables/mozilla/core/col_span-expected.txt: 28 29 2007-08-11 Darin Adler <darin@apple.com> 30 31 - added a bunch of missing layout test results 32 33 * editing/style/font-family-with-space-expected.checksum: Added. 34 * editing/style/font-family-with-space-expected.png: Added. 35 * fast/dom/frame-loading-via-document-write-expected.checksum: Added. 36 * fast/dom/frame-loading-via-document-write-expected.png: Added. 37 * fast/encoding/xmacroman-encoding-test-expected.checksum: Added. 38 * fast/encoding/xmacroman-encoding-test-expected.png: Added. 39 * fast/frames/frame-navigation-expected.checksum: Added. 40 * fast/frames/frame-navigation-expected.png: Added. 41 * fast/frames/frame-set-whitespace-attributes-expected.checksum: Added. 42 * fast/frames/frame-set-whitespace-attributes-expected.png: Added. 43 * fast/frames/inline-object-inside-frameset-expected.checksum: Added. 44 * fast/frames/inline-object-inside-frameset-expected.png: Added. 45 * fast/html/keygen-expected.checksum: Added. 46 * fast/html/keygen-expected.png: Added. 47 * fast/images/pdf-as-image-landscape-expected.checksum: Added. 48 * fast/images/pdf-as-image-landscape-expected.png: Added. 49 * fast/inline-block/14498-positionForCoordinates-expected.checksum: Added. 50 * fast/inline-block/14498-positionForCoordinates-expected.png: Added. 51 1 52 2007-08-11 Darin Adler <darin@apple.com> 2 53 -
trunk/LayoutTests/fast/text/whitespace/026-expected.checksum
r21383 r25011 1 a2c2ca5888215c4a9c1ede67742e850e 1 dab7daff12291d74bbcf06c671821057 -
trunk/LayoutTests/fast/text/whitespace/026-expected.txt
r21383 r25011 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 450x187 RenderTableSection {TBODY} at (0,0) size 450x188 RenderTableRow {TR} at (0,0) size 450x186 RenderTable {TABLE} at (0,0) size 784x18 7 RenderTableSection {TBODY} at (0,0) size 784x18 8 RenderTableRow {TR} at (0,0) size 784x18 9 9 RenderTableCell {TD} at (0,0) size 4x18 [r=0 c=0 rs=1 cs=1] 10 10 RenderInline {B} at (0,0) size 4x18 11 11 RenderText {#text} at (0,0) size 4x18 12 12 text run at (0,0) width 4: "\x{B7}" 13 RenderTableCell {TD} at (4,0) size 446x18 [r=0 c=1 rs=1 cs=1]13 RenderTableCell {TD} at (4,0) size 780x18 [r=0 c=1 rs=1 cs=1] 14 14 RenderText {#text} at (0,0) size 388x18 15 15 text run at (0,0) width 388: "There should be space between the bullet and this line of text." -
trunk/LayoutTests/tables/mozilla/bugs/bug35662-expected.checksum
r19346 r25011 1 30895f22a34714055de4e0b073d988f8 1 9020c523d5bbd4722c9e56018b936762 -
trunk/LayoutTests/tables/mozilla/bugs/bug35662-expected.txt
r19346 r25011 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 16 9x28 [border: (1px outset #808080)]7 RenderTableSection {TBODY} at (1,1) size 16 7x268 RenderTableRow {TR} at (0,2) size 16 7x226 RenderTable {TABLE} at (0,0) size 168x28 [border: (1px outset #808080)] 7 RenderTableSection {TBODY} at (1,1) size 166x26 8 RenderTableRow {TR} at (0,2) size 166x22 9 9 RenderTableCell {TD} at (2,2) size 59x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 10 10 RenderText {#text} at (2,2) size 55x18 … … 13 13 RenderText {#text} at (2,2) size 26x18 14 14 text run at (2,2) width 26: "Mid" 15 RenderTableCell {TD} at (96,2) size 6 9x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]15 RenderTableCell {TD} at (96,2) size 68x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] 16 16 RenderText {#text} at (2,2) size 64x18 17 17 text run at (2,2) width 64: "Right side" 18 RenderTable {TABLE} at (0,28) size 16 9x52 [border: (1px outset #808080)]19 RenderTableSection {TBODY} at (1,1) size 16 7x5020 RenderTableRow {TR} at (0,2) size 16 7x2218 RenderTable {TABLE} at (0,28) size 168x52 [border: (1px outset #808080)] 19 RenderTableSection {TBODY} at (1,1) size 166x50 20 RenderTableRow {TR} at (0,2) size 166x22 21 21 RenderTableCell {TD} at (2,2) size 59x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 22 22 RenderText {#text} at (2,2) size 55x18 … … 25 25 RenderText {#text} at (2,2) size 26x18 26 26 text run at (2,2) width 26: "Mid" 27 RenderTableCell {TD} at (96,2) size 6 9x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]27 RenderTableCell {TD} at (96,2) size 68x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] 28 28 RenderText {#text} at (2,2) size 64x18 29 29 text run at (2,2) width 64: "Right side" 30 RenderTableRow {TR} at (0,26) size 16 7x2230 RenderTableRow {TR} at (0,26) size 166x22 31 31 RenderTableCell {TD} at (2,26) size 59x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] 32 32 RenderText {#text} at (2,2) size 55x18 … … 35 35 RenderText {#text} at (2,2) size 26x18 36 36 text run at (2,2) width 26: "Mid" 37 RenderTableCell {TD} at (96,26) size 6 9x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]37 RenderTableCell {TD} at (96,26) size 68x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] 38 38 RenderText {#text} at (2,2) size 64x18 39 39 text run at (2,2) width 64: "Right side" -
trunk/LayoutTests/tables/mozilla/bugs/bug5799-expected.checksum
r19346 r25011 1 7b716f2ba5bd2c4e5bcdc70205d93cac 1 283f59688ade1fde598720f4328289f1 -
trunk/LayoutTests/tables/mozilla/bugs/bug5799-expected.txt
r19346 r25011 15 15 RenderBlock (anonymous) at (0,36) size 784x18 16 16 RenderBR {BR} at (0,0) size 0x18 17 RenderTable {TABLE} at (0,54) size 32 5x36 [border: (5px outset #808080)]18 RenderTableSection {TBODY} at (5,5) size 31 5x2619 RenderTableRow {TR} at (0,2) size 31 5x2220 RenderTableCell {TD} at (2,2) size 15 5x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]17 RenderTable {TABLE} at (0,54) size 324x36 [border: (5px outset #808080)] 18 RenderTableSection {TBODY} at (5,5) size 314x26 19 RenderTableRow {TR} at (0,2) size 314x22 20 RenderTableCell {TD} at (2,2) size 154x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 21 21 RenderText {#text} at (2,2) size 150x18 22 22 text run at (2,2) width 150: "almaalmaalmaalmaalma" 23 RenderTableCell {TD} at (15 9,2) size 154x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]23 RenderTableCell {TD} at (158,2) size 154x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] 24 24 RenderText {#text} at (2,2) size 8x18 25 25 text run at (2,2) width 8: "x" … … 33 33 text run at (0,18) width 255: "The cells are competing with each other." 34 34 RenderBR {BR} at (255,32) size 0x0 35 RenderTable {TABLE} at (0,176) size 3 40x36 [border: (5px outset #808080)]36 RenderTableSection {TBODY} at (5,5) size 3 30x2637 RenderTableRow {TR} at (0,2) size 3 30x2238 RenderTableCell {TD} at (2,2) size 6 6x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]35 RenderTable {TABLE} at (0,176) size 338x36 [border: (5px outset #808080)] 36 RenderTableSection {TBODY} at (5,5) size 328x26 37 RenderTableRow {TR} at (0,2) size 328x22 38 RenderTableCell {TD} at (2,2) size 64x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 39 39 RenderText {#text} at (2,2) size 60x18 40 40 text run at (2,2) width 60: "some text" 41 RenderTableCell {TD} at ( 70,2) size 128x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]41 RenderTableCell {TD} at (68,2) size 128x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] 42 42 RenderText {#text} at (2,2) size 8x18 43 43 text run at (2,2) width 8: "x" 44 RenderTableCell {TD} at ( 200,2) size 128x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]44 RenderTableCell {TD} at (198,2) size 128x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] 45 45 RenderText {#text} at (2,2) size 8x18 46 46 text run at (2,2) width 8: "x" -
trunk/LayoutTests/tables/mozilla/core/col_span-expected.checksum
r16432 r25011 1 5e27485f3f88783ca1c3718d7dd20a8f 1 0ff415105c7f46138a29c36eba197662 -
trunk/LayoutTests/tables/mozilla/core/col_span-expected.txt
r14684 r25011 16 16 RenderBlock (anonymous) at (0,46) size 784x18 17 17 RenderBR {BR} at (0,0) size 0x18 18 RenderTable {TABLE} at (0,64) size 21 7x46 [border: (1px outset #808080)]19 RenderTableSection {TBODY} at (1,1) size 21 5x4420 RenderTableRow {TR} at (0,2) size 21 5x4021 RenderTableCell {TD} at (2,2) size 10 5x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]18 RenderTable {TABLE} at (0,64) size 216x46 [border: (1px outset #808080)] 19 RenderTableSection {TBODY} at (1,1) size 214x44 20 RenderTableRow {TR} at (0,2) size 214x40 21 RenderTableCell {TD} at (2,2) size 104x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 22 22 RenderText {#text} at (2,2) size 80x36 23 23 text run at (2,2) width 80: "100 100 100" 24 24 text run at (2,20) width 80: "100 100 100" 25 RenderTableCell {TD} at (10 9,11) size 104x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]25 RenderTableCell {TD} at (108,11) size 104x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] 26 26 RenderText {#text} at (2,2) size 69x18 27 27 text run at (2,2) width 69: "50% width" 28 28 RenderBlock (anonymous) at (0,110) size 784x18 29 29 RenderBR {BR} at (0,0) size 0x18 30 RenderTable {TABLE} at (0,128) size 53 5x52 [border: (1px outset #808080)]31 RenderTableSection {TBODY} at (1,1) size 53 3x5032 RenderTableRow {TR} at (0,2) size 53 3x2230 RenderTable {TABLE} at (0,128) size 534x52 [border: (1px outset #808080)] 31 RenderTableSection {TBODY} at (1,1) size 532x50 32 RenderTableRow {TR} at (0,2) size 532x22 33 33 RenderTableCell {TD} at (2,2) size 104x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 34 34 RenderText {#text} at (2,2) size 24x18 35 35 text run at (2,2) width 24: "100" 36 RenderTableCell {TD} at (108,2) size 26 4x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]36 RenderTableCell {TD} at (108,2) size 263x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] 37 37 RenderText {#text} at (2,2) size 95x18 38 38 text run at (2,2) width 95: "no width given" 39 RenderTableCell {TD} at (37 4,2) size 157x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]39 RenderTableCell {TD} at (373,2) size 157x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] 40 40 RenderText {#text} at (2,2) size 69x18 41 41 text run at (2,2) width 69: "30% width" 42 RenderTableRow {TR} at (0,26) size 53 3x2243 RenderTableCell {TD} at (2,26) size 52 9x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=3]42 RenderTableRow {TR} at (0,26) size 532x22 43 RenderTableCell {TD} at (2,26) size 528x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=3] 44 44 RenderText {#text} at (2,2) size 93x18 45 45 text run at (2,2) width 93: "500 colspan=3" -
trunk/WebCore/ChangeLog
r25010 r25011 1 2007-08-11 Mitz Pettel <mitz@webkit.org> 2 3 Reviewed by Darin. 4 5 - fix http://bugs.webkit.org/show_bug.cgi?id=13670 6 <rdar://problem/5399619> Table misrender when one of the TDs has width=100% 7 8 Tests: fast/table/100-percent-cell-width.html 9 fast/table/percent-widths-stretch.html 10 11 * rendering/AutoTableLayout.cpp: 12 (WebCore::AutoTableLayout::calcPrefWidths): Changed the value used instead of 13 0% to avoid division by zero from 1% to less than 0.01%. Removed code that 14 added 0.5px to non-percent widths when calculating the scaling factor. The 15 latter change is covered by the percent-widths-stretch test, where the new 16 results match both WinIE 7 and Firefox 3. 17 1 18 2007-08-11 Darin Adler <darin@apple.com> 2 19 -
trunk/WebCore/rendering/AutoTableLayout.cpp
r23850 r25011 258 258 int maxNonPercent = 0; 259 259 260 // We substitute 0 percent by (epsilon / percentScaleFactor) percent in two places below to avoid division by zero. 261 // FIXME: Handle the 0% cases properly. 262 const int epsilon = 1; 263 260 264 int remainingPercent = 100 * percentScaleFactor; 261 265 for (unsigned int i = 0; i < m_layoutStruct.size(); i++) { … … 264 268 if (m_layoutStruct[i].effWidth.isPercent()) { 265 269 int percent = min(m_layoutStruct[i].effWidth.rawValue(), remainingPercent); 266 int pw = (m_layoutStruct[i].effMaxWidth * 100 * percentScaleFactor) / max(percent, percentScaleFactor);270 int pw = (m_layoutStruct[i].effMaxWidth * 100 * percentScaleFactor) / max(percent, epsilon); 267 271 remainingPercent -= percent; 268 272 maxPercent = max(pw, maxPercent); … … 273 277 274 278 if (shouldScaleColumns(m_table)) { 275 // FIXME: Why 50? 276 maxNonPercent = (maxNonPercent * 100 + 50) * percentScaleFactor / max(remainingPercent, percentScaleFactor); 279 maxNonPercent = maxNonPercent * 100 * percentScaleFactor / max(remainingPercent, epsilon); 277 280 maxWidth = max(maxNonPercent, maxWidth); 278 281 maxWidth = max(maxWidth, maxPercent);
Note: See TracChangeset
for help on using the changeset viewer.