Index: LayoutTests/platform/mac/virtual/slimmingpaint/fast/table/border-collapsing/004-vertical-expected.txt |
diff --git a/LayoutTests/platform/mac/fast/table/border-collapsing/004-vertical-expected.txt b/LayoutTests/platform/mac/virtual/slimmingpaint/fast/table/border-collapsing/004-vertical-expected.txt |
similarity index 83% |
copy from LayoutTests/platform/mac/fast/table/border-collapsing/004-vertical-expected.txt |
copy to LayoutTests/platform/mac/virtual/slimmingpaint/fast/table/border-collapsing/004-vertical-expected.txt |
index dda317a7375315e9d304b2a69d8fdedc9b4b3e3a..da5ba14e6e667d4dc1812ac4bf69864ef75a8317 100644 |
--- a/LayoutTests/platform/mac/fast/table/border-collapsing/004-vertical-expected.txt |
+++ b/LayoutTests/platform/mac/virtual/slimmingpaint/fast/table/border-collapsing/004-vertical-expected.txt |
@@ -48,23 +48,23 @@ layer at (0,0) size 800x868 |
RenderTableCell {TH} at (0,0) size 29x183 [border: (2px solid #800080)] [r=0 c=0 rs=1 cs=1] |
RenderText {#text} at (6,50) size 16x84 |
text run at (6,50) width 84: "Header One" |
- RenderTableCell {TH} at (0,183) size 29x173 [border: (2px solid #800080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (6,44) size 16x86 |
- text run at (6,44) width 85: "Header Two" |
- RenderTableCell {TH} at (0,356) size 29x193 [border: (2px solid #800080)] [r=0 c=2 rs=1 cs=1] |
- RenderText {#text} at (6,49) size 16x96 |
- text run at (6,49) width 96: "Header Three" |
+ RenderTableCell {TH} at (0,183) size 29x174 [border: (2px solid #800080)] [r=0 c=1 rs=1 cs=1] |
+ RenderText {#text} at (6,45) size 16x85 |
+ text run at (6,45) width 84: "Header Two" |
+ RenderTableCell {TH} at (0,357) size 29x192 [border: (2px solid #800080)] [r=0 c=2 rs=1 cs=1] |
+ RenderText {#text} at (6,49) size 16x95 |
+ text run at (6,49) width 95: "Header Three" |
RenderTableRow {TR} at (0,29) size 92x549 |
RenderTableCell {TD} at (29,24) size 92x135 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (30,-17) size 32x161 |
text run at (30,-17) width 119: "This table uses the" |
text run at (46,-17) width 161: "collapsed borders model." |
- RenderTableCell {TD} at (29,199) size 92x141 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
- RenderText {#text} at (22,-10) size 48x155 |
- text run at (22,-10) width 102: "This means that" |
- text run at (38,-10) width 153: "elements within the cell" |
- text run at (54,-10) width 155: "have no border-spacing." |
- RenderTableCell {TD} at (29,356) size 92x193 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (29,199) size 92x142 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
+ RenderText {#text} at (22,-10) size 48x163 |
+ text run at (22,-10) width 163: "This means that elements" |
+ text run at (38,-10) width 146: "within the cell have no" |
+ text run at (54,-10) width 100: "border-spacing." |
+ RenderTableCell {TD} at (29,357) size 92x192 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1] |
RenderText {#text} at (6,6) size 80x172 |
text run at (6,6) width 139: "Since it has collapsed" |
text run at (22,6) width 172: "borders, the borders on the" |
@@ -80,8 +80,8 @@ layer at (0,0) size 800x868 |
text run at (37,7) width 117: "solid blue, except " |
text run at (37,123) width 40: "where" |
text run at (53,7) width 157: "header cells override the" |
- text run at (69,7) width 46: "border." |
- RenderTableCell {TD} at (121,183) size 92x173 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
+ text run at (69,7) width 45: "border." |
+ RenderTableCell {TD} at (121,183) size 92x174 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
RenderText {#text} at (5,6) size 80x154 |
text run at (5,6) width 115: "The borders that I" |
text run at (21,6) width 97: "haven't already" |
@@ -89,73 +89,73 @@ layer at (0,0) size 800x868 |
text run at (53,6) width 53: "internal " |
text run at (53,58) width 101: "ones) should be" |
text run at (69,6) width 104: "thin solid green." |
- RenderTableCell {TD} at (121,356) size 92x193 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (121,357) size 92x192 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
RenderText {#text} at (5,6) size 64x156 |
text run at (5,6) width 156: "This table should have a" |
text run at (21,6) width 146: "1em margin around all" |
text run at (37,6) width 45: "edges. " |
text run at (37,50) width 82: "This margin " |
- text run at (37,132) width 11: "is" |
+ text run at (37,131) width 11: "is" |
text run at (53,6) width 124: "measured from the " |
RenderInline {EM} at (0,0) size 16x45 |
RenderText {#text} at (53,129) size 16x45 |
text run at (53,129) width 44: "middle" |
- RenderText {#text} at (69,6) size 16x83 |
- text run at (69,6) width 83: "of its border." |
+ RenderText {#text} at (69,6) size 16x82 |
+ text run at (69,6) width 82: "of its border." |
RenderTable {TABLE} at (248,16) size 270x552 [border: (3px solid #0000FF)] |
RenderTableSection {TBODY} at (3,3) size 264x546 |
RenderTableRow {TR} at (0,16) size 32x546 |
- RenderTableCell {TH} at (16,16) size 32x117 [border: (3px solid #800080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (8,16) size 16x85 |
- text run at (8,16) width 84: "Header One" |
- RenderTableCell {TH} at (16,149) size 32x139 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1] |
+ RenderTableCell {TH} at (16,16) size 32x118 [border: (3px solid #800080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (8,17) size 16x84 |
+ text run at (8,17) width 84: "Header One" |
+ RenderTableCell {TH} at (16,150) size 32x139 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1] |
RenderText {#text} at (8,27) size 16x85 |
- text run at (8,27) width 85: "Header Two" |
- RenderTableCell {TH} at (16,304) size 32x226 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1] |
- RenderText {#text} at (8,65) size 16x96 |
- text run at (8,65) width 96: "Header Three" |
+ text run at (8,27) width 84: "Header Two" |
+ RenderTableCell {TH} at (16,305) size 32x225 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1] |
+ RenderText {#text} at (8,65) size 16x95 |
+ text run at (8,65) width 95: "Header Three" |
RenderTableRow {TR} at (0,64) size 76x546 |
- RenderTableCell {TD} at (64,24) size 76x101 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1] |
+ RenderTableCell {TD} at (64,24) size 76x102 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (14,-2) size 48x96 |
text run at (14,-2) width 96: "This table uses" |
text run at (30,-2) width 84: "the separated" |
text run at (46,-2) width 96: "borders model." |
- RenderTableCell {TD} at (64,149) size 76x139 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
+ RenderTableCell {TD} at (64,150) size 76x139 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
RenderText {#text} at (6,6) size 64x126 |
text run at (6,6) width 102: "This means that" |
text run at (22,6) width 126: "elements within the" |
text run at (38,6) width 109: "cell have border-" |
text run at (54,6) width 102: "spacing of 1em." |
- RenderTableCell {TD} at (64,312) size 76x210 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (64,313) size 76x209 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1] |
RenderText {#text} at (14,-2) size 48x205 |
text run at (14,-2) width 205: "The borders on the header cells," |
text run at (30,-2) width 199: "on all sides, should be medium" |
text run at (46,-2) width 80: "solid purple." |
RenderTableRow {TR} at (0,156) size 92x546 |
- RenderTableCell {TD} at (156,16) size 92x117 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1] |
+ RenderTableCell {TD} at (156,16) size 92x118 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1] |
RenderText {#text} at (6,6) size 80x91 |
text run at (6,6) width 88: "The border of" |
text run at (22,6) width 91: "the table itself" |
text run at (38,6) width 62: "should be" |
text run at (54,6) width 88: "medium solid" |
text run at (70,6) width 32: "blue." |
- RenderTableCell {TD} at (156,165) size 92x107 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
+ RenderTableCell {TD} at (156,166) size 92x107 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
RenderText {#text} at (22,-10) size 48x123 |
text run at (22,-10) width 95: "The borders of" |
text run at (38,-10) width 113: "other cells should" |
text run at (54,-10) width 123: "be thin solid green." |
- RenderTableCell {TD} at (156,312) size 92x210 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (156,313) size 92x209 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
RenderText {#text} at (14,-2) size 48x191 |
text run at (14,-2) width 188: "This table should have a 1em" |
- text run at (30,-2) width 163: "margin around all edges. " |
- text run at (30,160) width 29: "This" |
+ text run at (30,-2) width 162: "margin around all edges. " |
+ text run at (30,159) width 29: "This" |
text run at (46,-2) width 50: "margin " |
text run at (46,47) width 135: "is measured from the" |
RenderInline {EM} at (0,0) size 16x68 |
RenderText {#text} at (62,-2) size 16x68 |
text run at (62,-2) width 68: "outer edge" |
- RenderText {#text} at (62,65) size 16x88 |
- text run at (62,65) width 87: " of its border." |
+ RenderText {#text} at (62,65) size 16x87 |
+ text run at (62,65) width 86: " of its border." |
RenderTable {TABLE} at (534,16) size 318x552 [border: (3px solid #0000FF)] |
RenderTableSection {TBODY} at (3,3) size 312x546 |
RenderTableRow {TR} at (0,8) size 32x546 |
@@ -164,10 +164,10 @@ layer at (0,0) size 800x868 |
text run at (8,28) width 84: "Header One" |
RenderTableCell {TH} at (8,141) size 32x199 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1] |
RenderText {#text} at (8,57) size 16x85 |
- text run at (8,57) width 85: "Header Two" |
+ text run at (8,57) width 84: "Header Two" |
RenderTableCell {TH} at (8,340) size 32x206 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1] |
RenderText {#text} at (8,55) size 16x96 |
- text run at (8,55) width 96: "Header Three" |
+ text run at (8,55) width 95: "Header Three" |
RenderTableRow {TR} at (0,48) size 124x546 |
RenderTableCell {TD} at (48,32) size 124x77 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (38,-26) size 48x119 |
@@ -177,7 +177,7 @@ layer at (0,0) size 800x868 |
RenderTableCell {TD} at (48,141) size 124x199 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
RenderText {#text} at (6,6) size 112x184 |
text run at (6,6) width 156: "Elements within the cell" |
- text run at (22,6) width 151: "have horizontal border-" |
+ text run at (22,6) width 150: "have horizontal border-" |
text run at (38,6) width 140: "spacing (i.e., width of" |
text run at (54,6) width 144: "vertical lines) of 0 and" |
text run at (70,6) width 52: "vertical " |
@@ -207,14 +207,14 @@ layer at (0,0) size 800x868 |
text run at (38,-10) width 146: "1em margin around all" |
text run at (54,-10) width 45: "edges. " |
text run at (54,34) width 82: "This margin " |
- text run at (54,116) width 11: "is" |
+ text run at (54,115) width 11: "is" |
text run at (70,-10) width 124: "measured from the " |
RenderInline {EM} at (0,0) size 32x158 |
RenderText {#text} at (70,113) size 32x158 |
text run at (70,113) width 34: "outer" |
text run at (86,-10) width 31: "edge" |
- RenderText {#text} at (86,20) size 16x87 |
- text run at (86,20) width 87: " of its border." |
+ RenderText {#text} at (86,20) size 16x86 |
+ text run at (86,20) width 86: " of its border." |
RenderTableCell {TD} at (180,348) size 124x190 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
RenderText {#text} at (14,-2) size 96x192 |
text run at (14,-2) width 191: "The table should not be wider" |
@@ -233,11 +233,11 @@ layer at (0,0) size 800x868 |
RenderText {#text} at (8,32) size 16x84 |
text run at (8,32) width 84: "Header One" |
RenderTableCell {TH} at (0,164) size 32x150 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (8,32) size 16x86 |
- text run at (8,32) width 85: "Header Two" |
+ RenderText {#text} at (8,33) size 16x84 |
+ text run at (8,33) width 84: "Header Two" |
RenderTableCell {TH} at (0,322) size 32x216 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1] |
RenderText {#text} at (8,60) size 16x96 |
- text run at (8,60) width 96: "Header Three" |
+ text run at (8,60) width 95: "Header Three" |
RenderTableRow {TR} at (0,32) size 92x546 |
RenderTableCell {TD} at (32,24) size 92x116 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (22,-10) size 48x119 |
@@ -245,12 +245,12 @@ layer at (0,0) size 800x868 |
text run at (38,-10) width 113: "separated borders" |
text run at (54,-10) width 44: "model." |
RenderTableCell {TD} at (32,164) size 92x150 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
- RenderText {#text} at (6,6) size 80x130 |
+ RenderText {#text} at (6,6) size 80x129 |
text run at (6,6) width 128: "Elements within the" |
text run at (22,6) width 127: "cell have horizontal" |
- text run at (38,6) width 114: "border-spacing of" |
+ text run at (38,6) width 113: "border-spacing of" |
text run at (54,6) width 119: "0.5em and vertical" |
- text run at (70,6) width 130: "border-spacing of 0." |
+ text run at (70,6) width 129: "border-spacing of 0." |
RenderTableCell {TD} at (32,338) size 92x184 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1] |
RenderText {#text} at (22,-10) size 48x180 |
text run at (22,-10) width 168: "The borders on the header" |
@@ -267,9 +267,9 @@ layer at (0,0) size 800x868 |
text run at (78,-2) width 124: "cells should be thin" |
text run at (94,-2) width 75: "solid green." |
RenderTableCell {TD} at (124,164) size 124x150 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
- RenderText {#text} at (6,6) size 80x123 |
+ RenderText {#text} at (6,6) size 80x122 |
text run at (6,6) width 111: "This table should" |
- text run at (22,6) width 123: "have a 1em margin" |
+ text run at (22,6) width 122: "have a 1em margin" |
text run at (38,6) width 109: "around all edges." |
text run at (54,6) width 82: "This margin " |
text run at (54,87) width 11: "is" |
@@ -279,7 +279,7 @@ layer at (0,0) size 800x868 |
text run at (86,6) width 68: "outer edge" |
RenderText {#text} at (86,73) size 32x105 |
text run at (86,73) width 37: " of its" |
- text run at (102,6) width 46: "border." |
+ text run at (102,6) width 45: "border." |
RenderTableCell {TD} at (124,330) size 124x200 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1] |
RenderText {#text} at (14,-2) size 96x198 |
text run at (14,-2) width 191: "The table should not be wider" |
@@ -301,61 +301,61 @@ layer at (0,0) size 800x868 |
RenderTableCol {COL} at (0,0) size 0x0 [border: (3px solid #FF0000)] |
RenderTableSection {THEAD} at (16,0) size 46x552 [border: (3px solid #FF0000)] |
RenderTableRow {TR} at (0,2) size 42x552 [border: (3px solid #FF0000)] |
- RenderTableCell {TH} at (2,2) size 42x89 [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (5,19) size 32x51 |
+ RenderTableCell {TH} at (2,2) size 42x90 [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (5,19) size 32x52 |
text run at (5,19) width 51: "Header" |
text run at (21,30) width 29: "One" |
- RenderTableCell {TH} at (2,101) size 42x223 [r=0 c=1 rs=1 cs=1] |
+ RenderTableCell {TH} at (2,102) size 42x223 [r=0 c=1 rs=1 cs=1] |
RenderText {#text} at (13,69) size 16x85 |
- text run at (13,69) width 85: "Header Two" |
- RenderTableCell {TH} at (2,342) size 42x200 [r=0 c=2 rs=1 cs=1] |
- RenderText {#text} at (13,52) size 16x96 |
- text run at (13,52) width 96: "Header Three" |
+ text run at (13,69) width 84: "Header Two" |
+ RenderTableCell {TH} at (2,343) size 42x199 [r=0 c=2 rs=1 cs=1] |
+ RenderText {#text} at (13,52) size 16x95 |
+ text run at (13,52) width 95: "Header Three" |
RenderTableSection {TBODY} at (62,0) size 184x552 [border: (3px solid #FF0000)] |
RenderTableRow {TR} at (0,0) size 90x552 [border: (3px solid #FF0000)] |
- RenderTableCell {TD} at (0,2) size 90x89 [r=0 c=0 rs=1 cs=1] |
+ RenderTableCell {TD} at (0,2) size 90x90 [r=0 c=0 rs=1 cs=1] |
RenderText {#text} at (5,5) size 80x64 |
text run at (5,5) width 64: "This table" |
text run at (21,5) width 52: "uses the" |
text run at (37,5) width 61: "separated" |
text run at (53,5) width 48: "borders" |
text run at (69,5) width 44: "model." |
- RenderTableCell {TD} at (0,109) size 90x207 [r=0 c=1 rs=1 cs=1] |
+ RenderTableCell {TD} at (0,110) size 90x207 [r=0 c=1 rs=1 cs=1] |
RenderText {#text} at (21,-11) size 48x217 |
text run at (21,-11) width 177: "This means that borders are" |
text run at (37,-11) width 217: "allowed only on table elements or" |
text run at (53,-11) width 36: "table " |
text run at (53,24) width 88: "cell elements." |
- RenderTableCell {TD} at (0,342) size 90x200 [r=0 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (0,343) size 90x199 [r=0 c=2 rs=1 cs=1] |
RenderText {#text} at (13,-3) size 64x187 |
text run at (13,-3) width 156: "They are not allowed on" |
text run at (29,-3) width 187: "elements that represent rows," |
text run at (45,-3) width 158: "row-groups, columns, or" |
text run at (61,-3) width 101: "column-groups." |
RenderTableRow {TR} at (0,92) size 90x552 [border: (3px solid #FF0000)] |
- RenderTableCell {TD} at (92,2) size 90x89 [r=1 c=0 rs=1 cs=1] |
+ RenderTableCell {TD} at (92,2) size 90x90 [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (5,5) size 80x79 |
text run at (5,5) width 38: "There" |
text run at (21,5) width 62: "should be" |
text run at (37,5) width 68: "no borders" |
text run at (53,5) width 79: "at all on this" |
text run at (69,5) width 37: "table!" |
- RenderTableCell {TD} at (92,101) size 90x223 [r=1 c=1 rs=1 cs=1] |
+ RenderTableCell {TD} at (92,102) size 90x223 [r=1 c=1 rs=1 cs=1] |
RenderText {#text} at (13,-3) size 64x224 |
text run at (13,-3) width 224: "If there are any borders shown that" |
text run at (29,-3) width 200: "are not medium solid red, then " |
text run at (29,196) width 20: "the" |
text run at (45,-3) width 208: "problem is something other than" |
text run at (61,-3) width 150: "what this test is testing." |
- RenderTableCell {TD} at (92,342) size 90x200 [r=1 c=2 rs=1 cs=1] |
+ RenderTableCell {TD} at (92,343) size 90x199 [r=1 c=2 rs=1 cs=1] |
RenderText {#text} at (13,-3) size 48x191 |
text run at (13,-3) width 188: "This table should have a 1em" |
- text run at (29,-3) width 163: "margin around all edges. " |
- text run at (29,159) width 29: "This" |
+ text run at (29,-3) width 162: "margin around all edges. " |
+ text run at (29,158) width 29: "This" |
text run at (45,-3) width 50: "margin " |
text run at (45,46) width 135: "is measured from the" |
RenderInline {EM} at (0,0) size 16x68 |
RenderText {#text} at (61,-3) size 16x68 |
text run at (61,-3) width 68: "outer edge" |
- RenderText {#text} at (61,64) size 16x88 |
- text run at (61,64) width 87: " of its border." |
+ RenderText {#text} at (61,64) size 16x87 |
+ text run at (61,64) width 86: " of its border." |