Index: LayoutTests/platform/win/fast/table/border-collapsing/004-vertical-expected.txt |
diff --git a/LayoutTests/platform/win/fast/table/border-collapsing/004-vertical-expected.txt b/LayoutTests/platform/win/fast/table/border-collapsing/004-vertical-expected.txt |
index 749b4556bb16ca69ff106d02b6d954696139a8af..9ef4836051e0ba9ed3ac6ad9f4176c75cfa3b9a5 100644 |
--- a/LayoutTests/platform/win/fast/table/border-collapsing/004-vertical-expected.txt |
+++ b/LayoutTests/platform/win/fast/table/border-collapsing/004-vertical-expected.txt |
@@ -48,23 +48,23 @@ layer at (0,0) size 800x911 |
RenderTableCell {TH} at (0,0) size 31x183 [border: (2px solid #800080)] [r=0 c=0 rs=1 cs=1] |
RenderText {#text} at (6,50) size 17x84 |
text run at (6,50) width 84: "Header One" |
- RenderTableCell {TH} at (0,183) size 31x173 [border: (2px solid #800080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (6,44) size 17x86 |
- text run at (6,44) width 85: "Header Two" |
- RenderTableCell {TH} at (0,356) size 31x193 [border: (2px solid #800080)] [r=0 c=2 rs=1 cs=1] |
- RenderText {#text} at (6,49) size 17x96 |
- text run at (6,49) width 96: "Header Three" |
+ RenderTableCell {TH} at (0,183) size 31x174 [border: (2px solid #800080)] [r=0 c=1 rs=1 cs=1] |
+ RenderText {#text} at (6,45) size 17x85 |
+ text run at (6,45) width 84: "Header Two" |
+ RenderTableCell {TH} at (0,357) size 31x192 [border: (2px solid #800080)] [r=0 c=2 rs=1 cs=1] |
+ RenderText {#text} at (6,49) size 17x95 |
+ text run at (6,49) width 95: "Header Three" |
RenderTableRow {TR} at (0,31) size 102x549 |
RenderTableCell {TD} at (31,27) size 102x129 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (33,-20) size 35x161 |
text run at (33,-20) width 119: "This table uses the" |
text run at (51,-20) width 161: "collapsed borders model." |
- RenderTableCell {TD} at (31,201) size 102x137 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
- RenderText {#text} at (24,-12) size 53x155 |
- text run at (24,-12) width 102: "This means that" |
- text run at (42,-12) width 153: "elements within the cell" |
- text run at (60,-12) width 155: "have no border-spacing." |
- RenderTableCell {TD} at (31,356) size 102x193 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (31,201) size 102x138 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
+ RenderText {#text} at (24,-12) size 53x163 |
+ text run at (24,-12) width 163: "This means that elements" |
+ text run at (42,-12) width 146: "within the cell have no" |
+ text run at (60,-12) width 100: "border-spacing." |
+ RenderTableCell {TD} at (31,357) size 102x192 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1] |
RenderText {#text} at (6,6) size 89x172 |
text run at (6,6) width 139: "Since it has collapsed" |
text run at (24,6) width 172: "borders, the borders on the" |
@@ -80,8 +80,8 @@ layer at (0,0) size 800x911 |
text run at (41,7) width 117: "solid blue, except " |
text run at (41,123) width 40: "where" |
text run at (59,7) width 157: "header cells override the" |
- text run at (77,7) width 46: "border." |
- RenderTableCell {TD} at (133,183) size 102x173 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
+ text run at (77,7) width 45: "border." |
+ RenderTableCell {TD} at (133,183) size 102x174 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
RenderText {#text} at (5,6) size 89x154 |
text run at (5,6) width 115: "The borders that I" |
text run at (23,6) width 97: "haven't already" |
@@ -89,73 +89,73 @@ layer at (0,0) size 800x911 |
text run at (59,6) width 53: "internal " |
text run at (59,58) width 101: "ones) should be" |
text run at (77,6) width 104: "thin solid green." |
- RenderTableCell {TD} at (133,356) size 102x193 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (133,357) size 102x192 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
RenderText {#text} at (5,6) size 71x156 |
text run at (5,6) width 156: "This table should have a" |
- text run at (23,6) width 146: "1em margin around all" |
+ text run at (23,6) width 145: "1em margin around all" |
text run at (41,6) width 45: "edges. " |
text run at (41,50) width 82: "This margin " |
- text run at (41,132) width 11: "is" |
+ text run at (41,131) width 11: "is" |
text run at (59,6) width 124: "measured from the " |
RenderInline {EM} at (0,0) size 17x45 |
RenderText {#text} at (59,129) size 17x45 |
text run at (59,129) width 44: "middle" |
- RenderText {#text} at (77,6) size 17x83 |
- text run at (77,6) width 83: "of its border." |
+ RenderText {#text} at (77,6) size 17x82 |
+ text run at (77,6) width 82: "of its border." |
RenderTable {TABLE} at (270,16) size 290x552 [border: (3px solid #0000FF)] |
RenderTableSection {TBODY} at (3,3) size 284x546 |
RenderTableRow {TR} at (0,16) size 34x546 |
- RenderTableCell {TH} at (16,16) size 34x117 [border: (3px solid #800080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (8,16) size 17x85 |
- text run at (8,16) width 84: "Header One" |
- RenderTableCell {TH} at (16,149) size 34x139 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1] |
+ RenderTableCell {TH} at (16,16) size 34x118 [border: (3px solid #800080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (8,17) size 17x84 |
+ text run at (8,17) width 84: "Header One" |
+ RenderTableCell {TH} at (16,150) size 34x139 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1] |
RenderText {#text} at (8,27) size 17x85 |
- text run at (8,27) width 85: "Header Two" |
- RenderTableCell {TH} at (16,304) size 34x226 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1] |
- RenderText {#text} at (8,65) size 17x96 |
- text run at (8,65) width 96: "Header Three" |
+ text run at (8,27) width 84: "Header Two" |
+ RenderTableCell {TH} at (16,305) size 34x225 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1] |
+ RenderText {#text} at (8,65) size 17x95 |
+ text run at (8,65) width 95: "Header Three" |
RenderTableRow {TR} at (0,66) size 84x546 |
- RenderTableCell {TD} at (66,25) size 84x99 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1] |
+ RenderTableCell {TD} at (66,25) size 84x100 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (15,-3) size 53x96 |
text run at (15,-3) width 96: "This table uses" |
text run at (33,-3) width 84: "the separated" |
text run at (51,-3) width 96: "borders model." |
- RenderTableCell {TD} at (66,149) size 84x139 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
+ RenderTableCell {TD} at (66,150) size 84x139 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
RenderText {#text} at (6,6) size 71x126 |
text run at (6,6) width 102: "This means that" |
text run at (24,6) width 126: "elements within the" |
text run at (42,6) width 109: "cell have border-" |
text run at (60,6) width 102: "spacing of 1em." |
- RenderTableCell {TD} at (66,313) size 84x208 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (66,314) size 84x207 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1] |
RenderText {#text} at (15,-3) size 53x205 |
text run at (15,-3) width 205: "The borders on the header cells," |
text run at (33,-3) width 199: "on all sides, should be medium" |
text run at (51,-3) width 80: "solid purple." |
RenderTableRow {TR} at (0,166) size 102x546 |
- RenderTableCell {TD} at (166,16) size 102x117 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1] |
+ RenderTableCell {TD} at (166,16) size 102x118 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1] |
RenderText {#text} at (6,6) size 89x91 |
text run at (6,6) width 88: "The border of" |
text run at (24,6) width 91: "the table itself" |
text run at (42,6) width 62: "should be" |
text run at (60,6) width 88: "medium solid" |
text run at (78,6) width 32: "blue." |
- RenderTableCell {TD} at (166,167) size 102x103 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
+ RenderTableCell {TD} at (166,168) size 102x103 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
RenderText {#text} at (24,-12) size 53x123 |
text run at (24,-12) width 95: "The borders of" |
text run at (42,-12) width 113: "other cells should" |
text run at (60,-12) width 123: "be thin solid green." |
- RenderTableCell {TD} at (166,313) size 102x208 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (166,314) size 102x207 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
RenderText {#text} at (15,-3) size 53x191 |
text run at (15,-3) width 188: "This table should have a 1em" |
- text run at (33,-3) width 163: "margin around all edges. " |
- text run at (33,159) width 29: "This" |
+ text run at (33,-3) width 162: "margin around all edges. " |
+ text run at (33,158) width 29: "This" |
text run at (51,-3) width 50: "margin " |
text run at (51,46) width 135: "is measured from the" |
RenderInline {EM} at (0,0) size 17x68 |
RenderText {#text} at (69,-3) size 17x68 |
text run at (69,-3) width 68: "outer edge" |
- RenderText {#text} at (69,64) size 17x88 |
- text run at (69,64) width 87: " of its border." |
+ RenderText {#text} at (69,64) size 17x87 |
+ text run at (69,64) width 86: " of its border." |
RenderTable {TABLE} at (576,16) size 348x552 [border: (3px solid #0000FF)] |
RenderTableSection {TBODY} at (3,3) size 342x546 |
RenderTableRow {TR} at (0,8) size 34x546 |
@@ -164,10 +164,10 @@ layer at (0,0) size 800x911 |
text run at (8,28) width 84: "Header One" |
RenderTableCell {TH} at (8,141) size 34x199 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1] |
RenderText {#text} at (8,57) size 17x85 |
- text run at (8,57) width 85: "Header Two" |
+ text run at (8,57) width 84: "Header Two" |
RenderTableCell {TH} at (8,340) size 34x206 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1] |
RenderText {#text} at (8,55) size 17x96 |
- text run at (8,55) width 96: "Header Three" |
+ text run at (8,55) width 95: "Header Three" |
RenderTableRow {TR} at (0,50) size 138x546 |
RenderTableCell {TD} at (50,36) size 138x69 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (42,-30) size 53x119 |
@@ -177,7 +177,7 @@ layer at (0,0) size 800x911 |
RenderTableCell {TD} at (50,141) size 138x199 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
RenderText {#text} at (6,6) size 125x184 |
text run at (6,6) width 156: "Elements within the cell" |
- text run at (24,6) width 151: "have horizontal border-" |
+ text run at (24,6) width 150: "have horizontal border-" |
text run at (42,6) width 140: "spacing (i.e., width of" |
text run at (60,6) width 144: "vertical lines) of 0 and" |
text run at (78,6) width 52: "vertical " |
@@ -204,17 +204,17 @@ layer at (0,0) size 800x911 |
RenderTableCell {TD} at (196,159) size 138x163 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
RenderText {#text} at (24,-12) size 71x156 |
text run at (24,-12) width 156: "This table should have a" |
- text run at (42,-12) width 146: "1em margin around all" |
+ text run at (42,-12) width 145: "1em margin around all" |
text run at (60,-12) width 45: "edges. " |
text run at (60,32) width 82: "This margin " |
- text run at (60,114) width 11: "is" |
+ text run at (60,113) width 11: "is" |
text run at (78,-12) width 124: "measured from the " |
RenderInline {EM} at (0,0) size 35x158 |
RenderText {#text} at (78,111) size 35x158 |
text run at (78,111) width 34: "outer" |
text run at (96,-12) width 31: "edge" |
- RenderText {#text} at (96,18) size 17x87 |
- text run at (96,18) width 87: " of its border." |
+ RenderText {#text} at (96,18) size 17x86 |
+ text run at (96,18) width 86: " of its border." |
RenderTableCell {TD} at (196,349) size 138x188 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
RenderText {#text} at (15,-3) size 107x192 |
text run at (15,-3) width 191: "The table should not be wider" |
@@ -233,11 +233,11 @@ layer at (0,0) size 800x911 |
RenderText {#text} at (8,32) size 17x84 |
text run at (8,32) width 84: "Header One" |
RenderTableCell {TH} at (0,164) size 34x150 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (8,32) size 17x86 |
- text run at (8,32) width 85: "Header Two" |
+ RenderText {#text} at (8,33) size 17x84 |
+ text run at (8,33) width 84: "Header Two" |
RenderTableCell {TH} at (0,322) size 34x216 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1] |
RenderText {#text} at (8,60) size 17x96 |
- text run at (8,60) width 96: "Header Three" |
+ text run at (8,60) width 95: "Header Three" |
RenderTableRow {TR} at (0,34) size 102x546 |
RenderTableCell {TD} at (34,26) size 102x112 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (24,-12) size 53x119 |
@@ -245,12 +245,12 @@ layer at (0,0) size 800x911 |
text run at (42,-12) width 113: "separated borders" |
text run at (60,-12) width 44: "model." |
RenderTableCell {TD} at (34,164) size 102x150 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
- RenderText {#text} at (6,6) size 89x130 |
+ RenderText {#text} at (6,6) size 89x129 |
text run at (6,6) width 128: "Elements within the" |
text run at (24,6) width 127: "cell have horizontal" |
- text run at (42,6) width 114: "border-spacing of" |
+ text run at (42,6) width 113: "border-spacing of" |
text run at (60,6) width 119: "0.5em and vertical" |
- text run at (78,6) width 130: "border-spacing of 0." |
+ text run at (78,6) width 129: "border-spacing of 0." |
RenderTableCell {TD} at (34,340) size 102x180 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1] |
RenderText {#text} at (24,-12) size 53x180 |
text run at (24,-12) width 168: "The borders on the header" |
@@ -267,9 +267,9 @@ layer at (0,0) size 800x911 |
text run at (87,-3) width 124: "cells should be thin" |
text run at (105,-3) width 75: "solid green." |
RenderTableCell {TD} at (136,164) size 138x150 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
- RenderText {#text} at (6,6) size 89x123 |
+ RenderText {#text} at (6,6) size 89x122 |
text run at (6,6) width 111: "This table should" |
- text run at (24,6) width 123: "have a 1em margin" |
+ text run at (24,6) width 122: "have a 1em margin" |
text run at (42,6) width 109: "around all edges." |
text run at (60,6) width 82: "This margin " |
text run at (60,87) width 11: "is" |
@@ -279,7 +279,7 @@ layer at (0,0) size 800x911 |
text run at (96,6) width 68: "outer edge" |
RenderText {#text} at (96,73) size 35x105 |
text run at (96,73) width 37: " of its" |
- text run at (114,6) width 46: "border." |
+ text run at (114,6) width 45: "border." |
RenderTableCell {TD} at (136,331) size 138x198 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
RenderText {#text} at (15,-3) size 107x198 |
text run at (15,-3) width 191: "The table should not be wider" |
@@ -301,61 +301,61 @@ layer at (0,0) size 800x911 |
RenderTableCol {COL} at (0,0) size 0x0 [border: (3px solid #FF0000)] |
RenderTableSection {THEAD} at (18,0) size 50x552 [border: (3px solid #FF0000)] |
RenderTableRow {TR} at (0,2) size 46x552 [border: (3px solid #FF0000)] |
- RenderTableCell {TH} at (2,2) size 46x89 [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (5,19) size 35x51 |
+ RenderTableCell {TH} at (2,2) size 46x90 [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (5,19) size 35x52 |
text run at (5,19) width 51: "Header" |
text run at (23,30) width 29: "One" |
- RenderTableCell {TH} at (2,102) size 46x221 [r=0 c=1 rs=1 cs=1] |
+ RenderTableCell {TH} at (2,103) size 46x221 [r=0 c=1 rs=1 cs=1] |
RenderText {#text} at (14,68) size 17x85 |
- text run at (14,68) width 85: "Header Two" |
- RenderTableCell {TH} at (2,343) size 46x198 [r=0 c=2 rs=1 cs=1] |
- RenderText {#text} at (14,51) size 17x96 |
- text run at (14,51) width 96: "Header Three" |
+ text run at (14,68) width 84: "Header Two" |
+ RenderTableCell {TH} at (2,344) size 46x197 [r=0 c=2 rs=1 cs=1] |
+ RenderText {#text} at (14,51) size 17x95 |
+ text run at (14,51) width 95: "Header Three" |
RenderTableSection {TBODY} at (68,0) size 204x552 [border: (3px solid #FF0000)] |
RenderTableRow {TR} at (0,0) size 100x552 [border: (3px solid #FF0000)] |
- RenderTableCell {TD} at (0,2) size 100x89 [r=0 c=0 rs=1 cs=1] |
+ RenderTableCell {TD} at (0,2) size 100x90 [r=0 c=0 rs=1 cs=1] |
RenderText {#text} at (5,5) size 89x64 |
text run at (5,5) width 64: "This table" |
text run at (23,5) width 52: "uses the" |
text run at (41,5) width 61: "separated" |
text run at (59,5) width 48: "borders" |
text run at (77,5) width 44: "model." |
- RenderTableCell {TD} at (0,111) size 100x203 [r=0 c=1 rs=1 cs=1] |
+ RenderTableCell {TD} at (0,112) size 100x203 [r=0 c=1 rs=1 cs=1] |
RenderText {#text} at (23,-13) size 53x217 |
text run at (23,-13) width 177: "This means that borders are" |
text run at (41,-13) width 217: "allowed only on table elements or" |
text run at (59,-13) width 36: "table " |
text run at (59,22) width 88: "cell elements." |
- RenderTableCell {TD} at (0,343) size 100x198 [r=0 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (0,344) size 100x197 [r=0 c=2 rs=1 cs=1] |
RenderText {#text} at (14,-4) size 71x187 |
text run at (14,-4) width 156: "They are not allowed on" |
text run at (32,-4) width 187: "elements that represent rows," |
text run at (50,-4) width 158: "row-groups, columns, or" |
text run at (68,-4) width 101: "column-groups." |
RenderTableRow {TR} at (0,102) size 100x552 [border: (3px solid #FF0000)] |
- RenderTableCell {TD} at (102,2) size 100x89 [r=1 c=0 rs=1 cs=1] |
+ RenderTableCell {TD} at (102,2) size 100x90 [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (5,5) size 89x79 |
text run at (5,5) width 38: "There" |
text run at (23,5) width 62: "should be" |
text run at (41,5) width 68: "no borders" |
text run at (59,5) width 79: "at all on this" |
text run at (77,5) width 37: "table!" |
- RenderTableCell {TD} at (102,102) size 100x221 [r=1 c=1 rs=1 cs=1] |
+ RenderTableCell {TD} at (102,103) size 100x221 [r=1 c=1 rs=1 cs=1] |
RenderText {#text} at (14,-4) size 71x224 |
text run at (14,-4) width 224: "If there are any borders shown that" |
text run at (32,-4) width 200: "are not medium solid red, then " |
text run at (32,195) width 20: "the" |
text run at (50,-4) width 208: "problem is something other than" |
text run at (68,-4) width 150: "what this test is testing." |
- RenderTableCell {TD} at (102,343) size 100x198 [r=1 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (102,344) size 100x197 [r=1 c=2 rs=1 cs=1] |
RenderText {#text} at (14,-4) size 53x191 |
text run at (14,-4) width 188: "This table should have a 1em" |
- text run at (32,-4) width 163: "margin around all edges. " |
- text run at (32,158) width 29: "This" |
+ text run at (32,-4) width 162: "margin around all edges. " |
+ text run at (32,157) width 29: "This" |
text run at (50,-4) width 50: "margin " |
text run at (50,45) width 135: "is measured from the" |
RenderInline {EM} at (0,0) size 17x68 |
RenderText {#text} at (68,-4) size 17x68 |
text run at (68,-4) width 68: "outer edge" |
- RenderText {#text} at (68,63) size 17x88 |
- text run at (68,63) width 87: " of its border." |
+ RenderText {#text} at (68,63) size 17x87 |
+ text run at (68,63) width 86: " of its border." |