+2011-10-03 Konstantin Scheglov <scheglov@google.com>
+
+ Right border missing from table with colspan and collapsing border
+ https://bugs.webkit.org/show_bug.cgi?id=14274
+
+ Reviewed by David Hyatt.
+
+ * fast/table/border-collapsing/bug14274-expected.png: Copied from LayoutTests/platform/chromium-win/fast/invalid/020-expected.png.
+ * fast/table/border-collapsing/bug14274-expected.txt: Added.
+ * fast/table/border-collapsing/bug14274.html: Added.
+ * platform/chromium-linux/fast/forms/file-input-disabled-expected.txt:
+ * platform/chromium-linux/fast/invalid/residual-style-expected.txt:
+ * platform/chromium-linux/tables/mozilla/bugs/bug56563-expected.png:
+ * platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug220653-expected.png:
+ * platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug7121-2-expected.png:
+ * platform/chromium-win/fast/invalid/017-expected.png:
+ * platform/chromium-win/fast/invalid/017-expected.txt:
+ * platform/chromium-win/fast/invalid/018-expected.png:
+ * platform/chromium-win/fast/invalid/018-expected.txt:
+ * platform/chromium-win/fast/invalid/020-expected.png:
+ * platform/chromium-win/fast/invalid/020-expected.txt:
+ * platform/chromium-win/fast/invalid/table-inside-stray-table-content-expected.txt:
+ * platform/chromium-win/fast/table/inline-form-assert-expected.txt:
+ * platform/chromium-win/tables/mozilla/bugs/bug113235-2-expected.txt:
+ * platform/chromium-win/tables/mozilla/bugs/bug23994-expected.txt:
+ * platform/chromium-win/tables/mozilla/bugs/bug56405-expected.txt:
+ * platform/chromium-win/tables/mozilla/bugs/bug56563-expected.txt:
+ * platform/chromium-win/tables/mozilla/bugs/bug9024-expected.txt:
+ * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug220653-expected.txt:
+ * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug3517-expected.txt:
+ * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug7121-2-expected.txt:
+ * platform/chromium-win/tables/mozilla_expected_failures/core/conflicts-expected.txt:
+ * platform/chromium-win/tables/mozilla_expected_failures/other/empty_cells-expected.txt:
+ * platform/gtk/fast/invalid/table-residual-style-crash-expected.txt:
+ * platform/mac/fast/invalid/table-residual-style-crash-expected.txt:
+ * platform/qt/fast/invalid/table-residual-style-crash-expected.txt:
+
2011-10-03 Adam Barth <abarth@webkit.org>
Update baselines after http://trac.webkit.org/changeset/96498.
--- /dev/null
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderTable {TABLE} at (0,0) size 54x50 [border: none]
+ RenderTableSection {TBODY} at (0,0) size 53x50
+ RenderTableRow {TR} at (0,0) size 53x50 [border: none (2px solid #00FF00) none]
+ RenderTableCell {TD} at (0,24) size 53x2 [border: none (1px solid #0000FF) none] [r=0 c=0 rs=1 cs=3]
--- /dev/null
+<!--
+Spanned TD is last on its TR, and TR border is wider, so TR border should be used.
+-->
+<html>
+ <head>
+ <title></title>
+ <style type="text/css">
+ TABLE {
+ border-collapse: collapse;
+ }
+ TD {
+ width: 50px;
+ height: 50px;
+ }
+ </style>
+ </head>
+ <body>
+ <table>
+ <tbody>
+ <tr style="border-right:2px solid lime">
+ <td style="border-right:1px solid blue" colSpan="3"/>
+ </tr>
+ </tbody>
+ </table>
+ </body>
+</html>
RenderText at (0,0) size 69x16
text run at (0,0) width 69: "Choose File"
RenderBR {BR} at (324,59) size 0x0
- RenderTable {TABLE} at (0,67) size 4x0
+ RenderTable {TABLE} at (0,67) size 2x0
RenderBlock (anonymous) at (0,611) size 769x20
RenderText {#text} at (0,0) size 76x19
text run at (0,0) width 76: "CAPTION: "
- RenderInline {FONT} at (0,0) size 164x19 [color=#008000]
- RenderTable {TABLE} at (76,15) size 4x0
- RenderBlock {CAPTION} at (0,0) size 4x0
+ RenderInline {FONT} at (0,0) size 162x19 [color=#008000]
+ RenderTable {TABLE} at (76,15) size 2x0
+ RenderBlock {CAPTION} at (0,0) size 2x0
RenderInline {FONT} at (0,0) size 0x0 [color=#FF0000]
- RenderText {#text} at (80,0) size 160x19
- text run at (80,0) width 160: "All of this should be green."
+ RenderText {#text} at (78,0) size 160x19
+ text run at (78,0) width 160: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock {HR} at (0,639) size 769x2 [border: (1px inset #000000)]
RenderBlock (anonymous) at (0,649) size 769x20
RenderBlock (anonymous) at (0,763) size 769x20
RenderText {#text} at (0,0) size 39x19
text run at (0,0) width 39: "COL: "
- RenderInline {FONT} at (0,0) size 164x19 [color=#008000]
+ RenderInline {FONT} at (0,0) size 162x19 [color=#008000]
RenderInline {FONT} at (0,0) size 0x19 [color=#FF0000]
- RenderTable {TABLE} at (39,15) size 4x0
+ RenderTable {TABLE} at (39,15) size 2x0
RenderTableCol {COLGROUP} at (0,0) size 0x0
RenderTableCol {COL} at (0,0) size 0x0
RenderInline {FONT} at (0,0) size 160x19 [color=#FF0000]
- RenderText {#text} at (43,0) size 160x19
- text run at (43,0) width 160: "All of this should be green."
+ RenderText {#text} at (41,0) size 160x19
+ text run at (41,0) width 160: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock {HR} at (0,791) size 769x2 [border: (1px inset #000000)]
RenderBlock (anonymous) at (0,801) size 769x20
RenderText {#text} at (0,0) size 92x19
text run at (0,0) width 92: "COLGROUP: "
- RenderInline {FONT} at (0,0) size 164x19 [color=#008000]
+ RenderInline {FONT} at (0,0) size 162x19 [color=#008000]
RenderInline {FONT} at (0,0) size 0x19 [color=#FF0000]
- RenderTable {TABLE} at (92,15) size 4x0
+ RenderTable {TABLE} at (92,15) size 2x0
RenderTableCol {COLGROUP} at (0,0) size 0x0
RenderInline {FONT} at (0,0) size 160x19 [color=#FF0000]
- RenderText {#text} at (96,0) size 160x19
- text run at (96,0) width 160: "All of this should be green."
+ RenderText {#text} at (94,0) size 160x19
+ text run at (94,0) width 160: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock {HR} at (0,829) size 769x2 [border: (1px inset #000000)]
RenderBlock (anonymous) at (0,839) size 769x20
RenderBlock (anonymous) at (0,3190) size 769x20
RenderText {#text} at (0,0) size 55x19
text run at (0,0) width 55: "TABLE: "
- RenderInline {FONT} at (0,0) size 164x19 [color=#008000]
+ RenderInline {FONT} at (0,0) size 162x19 [color=#008000]
RenderInline {FONT} at (0,0) size 0x19 [color=#FF0000]
- RenderTable {TABLE} at (55,15) size 4x0
+ RenderTable {TABLE} at (55,15) size 2x0
RenderInline {FONT} at (0,0) size 160x19 [color=#FF0000]
- RenderText {#text} at (59,0) size 160x19
- text run at (59,0) width 160: "All of this should be green."
+ RenderText {#text} at (57,0) size 160x19
+ text run at (57,0) width 160: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,3218) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
RenderBlock (anonymous) at (0,3228) size 769x20
- RenderInline {FONT} at (0,0) size 224x19 [color=#008000]
+ RenderInline {FONT} at (0,0) size 222x19 [color=#008000]
RenderText {#text} at (0,0) size 60x19
text run at (0,0) width 60: "TBODY: "
- RenderInline {FONT} at (0,0) size 164x19
+ RenderInline {FONT} at (0,0) size 162x19
RenderInline {FONT} at (0,0) size 0x19
- RenderTable {TABLE} at (60,13) size 4x2
- RenderTableSection {TBODY} at (0,0) size 4x2
+ RenderTable {TABLE} at (60,13) size 2x2
+ RenderTableSection {TBODY} at (0,0) size 2x2
RenderInline {FONT} at (0,0) size 160x19
- RenderText {#text} at (64,0) size 160x19
- text run at (64,0) width 160: "All of this should be green."
+ RenderText {#text} at (62,0) size 160x19
+ text run at (62,0) width 160: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,3256) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
RenderBlock (anonymous) at (0,3294) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
RenderBlock (anonymous) at (0,3304) size 769x20
- RenderInline {FONT} at (0,0) size 222x19 [color=#008000]
- RenderInline {FONT} at (0,0) size 222x19
+ RenderInline {FONT} at (0,0) size 220x19 [color=#008000]
+ RenderInline {FONT} at (0,0) size 220x19
RenderText {#text} at (0,0) size 58x19
text run at (0,0) width 58: "TFOOT: "
- RenderInline {FONT} at (0,0) size 164x19
+ RenderInline {FONT} at (0,0) size 162x19
RenderInline {FONT} at (0,0) size 0x19
- RenderTable {TABLE} at (58,13) size 4x2
- RenderTableSection {TFOOT} at (0,0) size 4x2
+ RenderTable {TABLE} at (58,13) size 2x2
+ RenderTableSection {TFOOT} at (0,0) size 2x2
RenderInline {FONT} at (0,0) size 160x19
- RenderText {#text} at (62,0) size 160x19
- text run at (62,0) width 160: "All of this should be green."
+ RenderText {#text} at (60,0) size 160x19
+ text run at (60,0) width 160: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,3332) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
RenderBlock (anonymous) at (0,3342) size 769x20
- RenderInline {FONT} at (0,0) size 222x19 [color=#008000]
- RenderInline {FONT} at (0,0) size 222x19
- RenderInline {FONT} at (0,0) size 222x19
+ RenderInline {FONT} at (0,0) size 220x19 [color=#008000]
+ RenderInline {FONT} at (0,0) size 220x19
+ RenderInline {FONT} at (0,0) size 220x19
RenderText {#text} at (0,0) size 58x19
text run at (0,0) width 58: "THEAD: "
- RenderInline {FONT} at (0,0) size 164x19
+ RenderInline {FONT} at (0,0) size 162x19
RenderInline {FONT} at (0,0) size 0x19
- RenderTable {TABLE} at (58,13) size 4x2
- RenderTableSection {THEAD} at (0,0) size 4x2
+ RenderTable {TABLE} at (58,13) size 2x2
+ RenderTableSection {THEAD} at (0,0) size 2x2
RenderInline {FONT} at (0,0) size 160x19
- RenderText {#text} at (62,0) size 160x19
- text run at (62,0) width 160: "All of this should be green."
+ RenderText {#text} at (60,0) size 160x19
+ text run at (60,0) width 160: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,3370) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
RenderBlock (anonymous) at (0,3380) size 769x20
- RenderInline {FONT} at (0,0) size 190x19 [color=#008000]
- RenderInline {FONT} at (0,0) size 190x19
- RenderInline {FONT} at (0,0) size 190x19
- RenderInline {FONT} at (0,0) size 190x19
+ RenderInline {FONT} at (0,0) size 188x19 [color=#008000]
+ RenderInline {FONT} at (0,0) size 188x19
+ RenderInline {FONT} at (0,0) size 188x19
+ RenderInline {FONT} at (0,0) size 188x19
RenderText {#text} at (0,0) size 26x19
text run at (0,0) width 26: "TR: "
- RenderInline {FONT} at (0,0) size 164x19
+ RenderInline {FONT} at (0,0) size 162x19
RenderInline {FONT} at (0,0) size 0x19
- RenderTable {TABLE} at (26,11) size 4x4
- RenderTableSection {TBODY} at (0,0) size 4x4
- RenderTableRow {TR} at (0,2) size 4x0
+ RenderTable {TABLE} at (26,11) size 2x4
+ RenderTableSection {TBODY} at (0,0) size 2x4
+ RenderTableRow {TR} at (0,2) size 2x0
RenderInline {FONT} at (0,0) size 160x19
- RenderText {#text} at (30,0) size 160x19
- text run at (30,0) width 160: "All of this should be green."
+ RenderText {#text} at (28,0) size 160x19
+ text run at (28,0) width 160: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,3408) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
RenderInline {A} at (0,0) size 147x19
RenderText {#text} at (0,0) size 147x19
text run at (0,0) width 147: "You should see this text."
- RenderTable {TABLE} at (0,36) size 4x4
- RenderTableSection {TBODY} at (0,0) size 4x4
- RenderTableRow {TR} at (0,2) size 4x0
+ RenderTable {TABLE} at (0,36) size 2x4
+ RenderTableSection {TBODY} at (0,0) size 2x4
+ RenderTableRow {TR} at (0,2) size 2x0
RenderTableRow {TR} at (0,2) size 6x2
RenderTableCell {TD} at (2,2) size 2x2 [r=0 c=0 rs=1 cs=1]
RenderTableRow {TR} at (0,6) size 6x0
- RenderTable {TABLE} at (0,8) size 4x4
- RenderTableSection {TBODY} at (0,0) size 4x4
- RenderTableRow {TR} at (0,2) size 4x0
+ RenderTable {TABLE} at (0,8) size 2x4
+ RenderTableSection {TBODY} at (0,0) size 2x4
+ RenderTableRow {TR} at (0,2) size 2x0
RenderBlock (anonymous) at (0,12) size 784x0
RenderInline {FONT} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,0) size 784x20
RenderText {#text} at (0,0) size 27x19
text run at (0,0) width 27: "Text"
- RenderTable {table} at (0,20) size 4x0
+ RenderTable {table} at (0,20) size 2x0
RenderTable at (0,20) size 0x0
RenderTableCol {colgroup} at (0,0) size 0x0
RenderBlock {DIV} at (0,36) size 784x86 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 780x50 [border: (10px solid #008000)]
RenderBlock {DIV} at (10,10) size 760x14 [border: (2px solid #0000FF)]
- RenderTable {TABLE} at (2,52) size 4x0
+ RenderTable {TABLE} at (2,52) size 2x0
RenderTable {TABLE} at (2,52) size 46x32 [border: (2px outset #808080)]
RenderTableSection {TBODY} at (2,2) size 42x28
RenderTableRow {TR} at (0,2) size 42x24
RenderBlock {P} at (0,36) size 784x20
RenderText {#text} at (0,0) size 172x19
text run at (0,0) width 172: "No assert means test PASS."
- RenderTable {TABLE} at (0,72) size 4x0
- RenderTable {TABLE} at (0,72) size 4x2
- RenderTableSection {TBODY} at (0,0) size 4x2
+ RenderTable {TABLE} at (0,72) size 2x0
+ RenderTable {TABLE} at (0,72) size 2x2
+ RenderTableSection {TBODY} at (0,0) size 2x2
RenderTable {TABLE} at (0,74) size 5x4
RenderTableSection {THEAD} at (0,0) size 5x4
RenderTableRow (anonymous) at (0,2) size 5x0
RenderTableRow (anonymous) at (0,2) size 5x0
RenderTableCell (anonymous) at (2,2) size 1x0 [r=0 c=0 rs=1 cs=1]
RenderInline {FORM} at (0,0) size 0x0
- RenderTable {TABLE} at (0,82) size 4x4
- RenderTableSection {TBODY} at (0,0) size 4x4
- RenderTableRow {TR} at (0,2) size 4x0
+ RenderTable {TABLE} at (0,82) size 2x4
+ RenderTableSection {TBODY} at (0,0) size 2x4
+ RenderTableRow {TR} at (0,2) size 2x0
RenderInline {A} at (0,0) size 169x24
RenderText {#text} at (0,0) size 169x24
text run at (0,0) width 169: "Table of Contents"
- RenderTable {TABLE} at (0,41) size 4x4
- RenderTableSection {TBODY} at (0,0) size 4x4
- RenderTableRow {TR} at (0,2) size 4x0
+ RenderTable {TABLE} at (0,41) size 2x4
+ RenderTableSection {TBODY} at (0,0) size 2x4
+ RenderTableRow {TR} at (0,2) size 2x0
RenderBlock (anonymous) at (0,77) size 784x0
RenderInline {FONT} at (0,0) size 0x0
RenderBlock (anonymous) at (0,0) size 784x20
RenderText {#text} at (0,0) size 9x19
text run at (0,0) width 9: ">"
- RenderTable {TABLE} at (0,20) size 4x0
- RenderBlock {CAPTION} at (0,0) size 4x0
+ RenderTable {TABLE} at (0,20) size 2x0
+ RenderBlock {CAPTION} at (0,0) size 2x0
layer at (0,0) size 785x1140
RenderBlock {HTML} at (0,0) size 785x1140
RenderBody {BODY} at (8,8) size 769x1124
- RenderTable {TABLE} at (0,0) size 4x1078
+ RenderTable {TABLE} at (0,0) size 2x1078
RenderTable {TABLE} at (0,1078) size 98x26
RenderTableSection {TBODY} at (0,0) size 98x26
RenderTableRow {TR} at (0,2) size 98x22
RenderBlock {P} at (0,36) size 784x40
RenderImage {IMG} at (0,0) size 126x40
RenderText {#text} at (0,0) size 0x0
- RenderTable {TABLE} at (0,92) size 6x2 [border: (1px outset #808080)]
+ RenderTable {TABLE} at (0,92) size 4x2 [border: (1px outset #808080)]
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderTable {TABLE} at (0,0) size 1x1 [border: none]
+ RenderTable {TABLE} at (0,0) size 0x1 [border: none]
RenderTableSection {TBODY} at (0,0) size 0x0
RenderTable {TABLE} at (0,0) size 800x38 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 798x36
RenderTableRow {TR} at (0,3) size 798x30
- RenderTableCell {TD} at (3,3) size 40x30 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=10]
+ RenderTableCell {TD} at (3,3) size 41x30 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=10]
RenderText {#text} at (5,5) size 11x19
text run at (5,5) width 11: "A"
- RenderTableCell {TD} at (46,3) size 218x30 [border: (1px inset #808080)] [r=0 c=10 rs=1 cs=50]
+ RenderTableCell {TD} at (47,3) size 217x30 [border: (1px inset #808080)] [r=0 c=10 rs=1 cs=50]
RenderText {#text} at (5,5) size 10x19
text run at (5,5) width 10: "B"
RenderTableCell {TD} at (267,3) size 528x30 [border: (1px inset #808080)] [r=0 c=60 rs=1 cs=120]
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderTable {TABLE} at (0,0) size 1x1 [border: none]
+ RenderTable {TABLE} at (0,0) size 0x1 [border: none]
RenderTableSection {TBODY} at (0,0) size 0x0
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderTable {TABLE} at (0,0) size 277x26
- RenderTableSection {TBODY} at (0,0) size 277x26
- RenderTableRow {TR} at (0,2) size 277x22
- RenderTableCell {TD} at (2,2) size 3x22 [bgcolor=#000000] [r=0 c=0 rs=1 cs=15]
+ RenderTable {TABLE} at (0,0) size 276x26
+ RenderTableSection {TBODY} at (0,0) size 276x26
+ RenderTableRow {TR} at (0,2) size 276x22
+ RenderTableCell {TD} at (2,2) size 2x22 [bgcolor=#000000] [r=0 c=0 rs=1 cs=15]
RenderBR {BR} at (1,1) size 0x19
- RenderTableCell {TD} at (7,2) size 264x18 [bgcolor=#000000] [r=0 c=15 rs=1 cs=1]
+ RenderTableCell {TD} at (6,2) size 264x18 [bgcolor=#000000] [r=0 c=15 rs=1 cs=1]
RenderInline {FONT} at (0,0) size 262x15 [color=#AAAAAA]
RenderText {#text} at (1,1) size 262x15
text run at (1,1) width 262: "Copyright \x{A9} 1998-1999 The Mozilla Organization."
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (273,2) size 2x22 [bgcolor=#000000] [r=0 c=16 rs=1 cs=15]
+ RenderTableCell {TD} at (272,2) size 2x22 [bgcolor=#000000] [r=0 c=16 rs=1 cs=15]
RenderBR {BR} at (1,1) size 0x19
RenderTable {TABLE} at (0,712) size 300x56 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 298x54
RenderTableRow {TR} at (0,2) size 298x24
- RenderTableCell {TD} at (2,2) size 147x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,2) size 146x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 44x19
text run at (2,2) width 44: "50CS2"
- RenderTableCell {TD} at (151,2) size 145x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (150,2) size 146x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 26x19
text run at (2,2) width 26: "auto"
RenderTableRow {TR} at (0,28) size 298x24
- RenderTableCell {TD} at (2,28) size 147x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,28) size 146x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 57x19
text run at (2,2) width 57: "50%CS2"
- RenderTableCell {TD} at (151,28) size 145x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (150,28) size 146x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 26x19
text run at (2,2) width 26: "auto"
RenderBlock (anonymous) at (0,768) size 769x40
RenderTable {TABLE} at (0,808) size 300x56 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 298x54
RenderTableRow {TR} at (0,2) size 298x24
- RenderTableCell {TD} at (2,2) size 89x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,2) size 87x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 52x19
text run at (2,2) width 52: "100CS2"
- RenderTableCell {TD} at (93,2) size 203x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (91,2) size 205x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 20x19
text run at (2,2) width 20: "bar"
RenderTableRow {TR} at (0,28) size 298x24
- RenderTableCell {TD} at (2,28) size 89x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,28) size 87x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 57x19
text run at (2,2) width 57: "30%CS2"
- RenderTableCell {TD} at (93,28) size 203x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (91,28) size 205x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 20x19
text run at (2,2) width 20: "bar"
RenderBlock (anonymous) at (0,864) size 769x40
RenderTable {TABLE} at (0,904) size 769x56 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 767x54
RenderTableRow {TR} at (0,2) size 767x24
- RenderTableCell {TD} at (2,2) size 77x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,2) size 76x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 52x19
text run at (2,2) width 52: "500CS2"
- RenderTableCell {TD} at (81,2) size 684x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (80,2) size 685x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 26x19
text run at (2,2) width 26: "atuo"
RenderTableRow {TR} at (0,28) size 767x24
- RenderTableCell {TD} at (2,28) size 77x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,28) size 76x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 57x19
text run at (2,2) width 57: "10%CS2"
- RenderTableCell {TD} at (81,28) size 684x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (80,28) size 685x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 26x19
text run at (2,2) width 26: "auto"
RenderBlock (anonymous) at (0,960) size 769x40
RenderBlock (anonymous) at (0,0) size 769x20
RenderText {#text} at (0,0) size 411x19
text run at (0,0) width 411: "this table should be about 38 pixels wide (colspan=4, cellspacing=2)"
- RenderTable {TABLE} at (0,20) size 29x8 [bgcolor=#FFA500] [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 27x6
- RenderTableRow {TR} at (0,2) size 27x2
- RenderTableCell {TD} at (2,2) size 3x2 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=4]
- RenderTableCell {TD} at (7,2) size 2x2 [border: (1px inset #808080)] [r=0 c=4 rs=1 cs=4]
- RenderTableCell {TD} at (11,2) size 2x2 [border: (1px inset #808080)] [r=0 c=8 rs=1 cs=4]
- RenderTableCell {TD} at (15,2) size 2x2 [border: (1px inset #808080)] [r=0 c=12 rs=1 cs=4]
- RenderTableCell {TD} at (19,2) size 2x2 [border: (1px inset #808080)] [r=0 c=16 rs=1 cs=4]
- RenderTableCell {TD} at (23,2) size 2x2 [border: (1px inset #808080)] [r=0 c=20 rs=1 cs=4]
+ RenderTable {TABLE} at (0,20) size 28x8 [bgcolor=#FFA500] [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 26x6
+ RenderTableRow {TR} at (0,2) size 26x2
+ RenderTableCell {TD} at (2,2) size 2x2 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=4]
+ RenderTableCell {TD} at (6,2) size 2x2 [border: (1px inset #808080)] [r=0 c=4 rs=1 cs=4]
+ RenderTableCell {TD} at (10,2) size 2x2 [border: (1px inset #808080)] [r=0 c=8 rs=1 cs=4]
+ RenderTableCell {TD} at (14,2) size 2x2 [border: (1px inset #808080)] [r=0 c=12 rs=1 cs=4]
+ RenderTableCell {TD} at (18,2) size 2x2 [border: (1px inset #808080)] [r=0 c=16 rs=1 cs=4]
+ RenderTableCell {TD} at (22,2) size 2x2 [border: (1px inset #808080)] [r=0 c=20 rs=1 cs=4]
RenderBlock (anonymous) at (0,28) size 769x20
RenderBR {BR} at (0,0) size 0x19
RenderBlock {P} at (0,1016) size 769x48
RenderBlock {FORM} at (0,0) size 784x0
RenderBlock (anonymous) at (0,0) size 784x0
RenderInline {FONT} at (0,0) size 0x0
- RenderTable {TABLE} at (0,0) size 4x0
+ RenderTable {TABLE} at (0,0) size 2x0
RenderBlock {FORM} at (0,0) size 784x0
RenderBlock (anonymous) at (0,0) size 784x0
RenderInline {FONT} at (0,0) size 0x0
- RenderTable {TABLE} at (0,0) size 4x0
+ RenderTable {TABLE} at (0,0) size 2x0
RenderBlock {FORM} at (0,0) size 784x0
RenderBlock (anonymous) at (0,0) size 784x0
RenderInline {FONT} at (0,0) size 0x0
- RenderTable {TABLE} at (0,0) size 4x0
+ RenderTable {TABLE} at (0,0) size 2x0
+2011-10-03 Konstantin Scheglov <scheglov@google.com>
+
+ Right border missing from table with colspan and collapsing border
+ https://bugs.webkit.org/show_bug.cgi?id=14274
+
+ Reviewed by David Hyatt.
+
+ Test: fast/table/border-collapsing/bug14274.html
+
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::RenderTable):
+ * rendering/RenderTable.h:
+ (WebCore::RenderTable::colToEffCol):
+
2011-10-03 Carlos Garcia Campos <cgarcia@igalia.com>
[GTK] Fix make distcheck build
, m_borderEnd(0)
{
setChildrenInline(false);
- m_columnPos.fill(0, 2);
- m_columns.fill(ColumnStruct(), 1);
+ m_columnPos.fill(0, 1);
}
int numEffCols() const { return m_columns.size(); }
int spanOfEffCol(int effCol) const { return m_columns[effCol].span; }
- int colToEffCol(int col) const
+ int colToEffCol(unsigned col) const
{
- int i = 0;
- int effCol = numEffCols();
- for (int c = 0; c < col && i < effCol; ++i)
- c += m_columns[i].span;
- return i;
+ unsigned effCol = 0;
+ unsigned numCols = numEffCols();
+ for (unsigned c = 0; effCol < numCols && c + m_columns[effCol].span - 1 < col; ++effCol)
+ c += m_columns[effCol].span;
+ return effCol;
}
int effColToCol(int effCol) const