Diff
Modified: trunk/LayoutTests/ChangeLog (96572 => 96573)
--- trunk/LayoutTests/ChangeLog 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/ChangeLog 2011-10-04 06:42:36 UTC (rev 96573)
@@ -1,3 +1,28 @@
+2011-10-03 Ryosuke Niwa <[email protected]>
+
+ Mac rebaseline after r96509.
+
+ * platform/mac/fast/forms/file-input-disabled-expected.txt:
+ * platform/mac/fast/invalid/017-expected.txt:
+ * platform/mac/fast/invalid/018-expected.txt:
+ * platform/mac/fast/invalid/020-expected.txt:
+ * platform/mac/fast/invalid/residual-style-expected.txt:
+ * platform/mac/fast/invalid/table-inside-stray-table-content-expected.txt:
+ * platform/mac/fast/table/inline-form-assert-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug113235-2-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug23994-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug56405-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug56563-expected.png:
+ * platform/mac/tables/mozilla/bugs/bug56563-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug9024-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.png:
+ * platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/bugs/bug7121-2-expected.png:
+ * platform/mac/tables/mozilla_expected_failures/bugs/bug7121-2-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/core/conflicts-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/other/empty_cells-expected.txt:
+ * tables/mozilla_expected_failures/bugs/bug3517-expected.txt:
+
2011-10-03 Csaba Osztrogonác <[email protected]>
[Qt] Unreviewed gardening. Update Qt specific expected files after r96509.
Modified: trunk/LayoutTests/platform/mac/fast/forms/file-input-disabled-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/fast/forms/file-input-disabled-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/fast/forms/file-input-disabled-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -19,4 +19,4 @@
RenderText at (0,0) size 62x13
text run at (0,0) width 62: "Choose File"
RenderBR {BR} at (327,52) size 0x0
- RenderTable {TABLE} at (0,59) size 4x0
+ RenderTable {TABLE} at (0,59) size 2x0
Modified: trunk/LayoutTests/platform/mac/fast/invalid/017-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/fast/invalid/017-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/fast/invalid/017-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -9,6 +9,6 @@
RenderInline {A} at (0,0) size 155x18
RenderText {#text} at (0,0) size 155x18
text run at (0,0) width 155: "You should see this text."
- RenderTable {TABLE} at (0,34) size 4x4
- RenderTableSection {TBODY} at (0,0) size 4x4
- RenderTableRow {TR} at (0,2) size 4x0
+ RenderTable {TABLE} at (0,34) size 2x4
+ RenderTableSection {TBODY} at (0,0) size 2x4
+ RenderTableRow {TR} at (0,2) size 2x0
Modified: trunk/LayoutTests/platform/mac/fast/invalid/018-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/fast/invalid/018-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/fast/invalid/018-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -13,9 +13,9 @@
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
Modified: trunk/LayoutTests/platform/mac/fast/invalid/020-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/fast/invalid/020-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/fast/invalid/020-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -6,6 +6,6 @@
RenderBlock (anonymous) at (0,0) size 784x18
RenderText {#text} at (0,0) size 29x18
text run at (0,0) width 29: "Text"
- RenderTable {table} at (0,18) size 4x0
+ RenderTable {table} at (0,18) size 2x0
RenderTable at (0,18) size 0x0
RenderTableCol {colgroup} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/invalid/residual-style-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/fast/invalid/residual-style-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/fast/invalid/residual-style-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -141,12 +141,12 @@
RenderBlock (anonymous) at (0,593) size 769x18
RenderText {#text} at (0,0) size 79x18
text run at (0,0) width 79: "CAPTION: "
- RenderInline {FONT} at (0,0) size 175x18 [color=#008000]
- RenderTable {TABLE} at (79,14) size 4x0
- RenderBlock {CAPTION} at (0,0) size 4x0
+ RenderInline {FONT} at (0,0) size 173x18 [color=#008000]
+ RenderTable {TABLE} at (79,14) size 2x0
+ RenderBlock {CAPTION} at (0,0) size 2x0
RenderInline {FONT} at (0,0) size 0x0 [color=#FF0000]
- RenderText {#text} at (83,0) size 171x18
- text run at (83,0) width 171: "All of this should be green."
+ RenderText {#text} at (81,0) size 171x18
+ text run at (81,0) width 171: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock {HR} at (0,619) size 769x2 [border: (1px inset #000000)]
RenderBlock (anonymous) at (0,629) size 769x18
@@ -182,26 +182,26 @@
RenderBlock (anonymous) at (0,737) size 769x18
RenderText {#text} at (0,0) size 41x18
text run at (0,0) width 41: "COL: "
- RenderInline {FONT} at (0,0) size 175x18 [color=#008000]
+ RenderInline {FONT} at (0,0) size 173x18 [color=#008000]
RenderInline {FONT} at (0,0) size 0x18 [color=#FF0000]
- RenderTable {TABLE} at (41,14) size 4x0
+ RenderTable {TABLE} at (41,14) size 2x0
RenderTableCol {COLGROUP} at (0,0) size 0x0
RenderTableCol {COL} at (0,0) size 0x0
RenderInline {FONT} at (0,0) size 171x18 [color=#FF0000]
- RenderText {#text} at (45,0) size 171x18
- text run at (45,0) width 171: "All of this should be green."
+ RenderText {#text} at (43,0) size 171x18
+ text run at (43,0) width 171: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock {HR} at (0,763) size 769x2 [border: (1px inset #000000)]
RenderBlock (anonymous) at (0,773) size 769x18
RenderText {#text} at (0,0) size 97x18
text run at (0,0) width 97: "COLGROUP: "
- RenderInline {FONT} at (0,0) size 175x18 [color=#008000]
+ RenderInline {FONT} at (0,0) size 173x18 [color=#008000]
RenderInline {FONT} at (0,0) size 0x18 [color=#FF0000]
- RenderTable {TABLE} at (97,14) size 4x0
+ RenderTable {TABLE} at (97,14) size 2x0
RenderTableCol {COLGROUP} at (0,0) size 0x0
RenderInline {FONT} at (0,0) size 171x18 [color=#FF0000]
- RenderText {#text} at (101,0) size 171x18
- text run at (101,0) width 171: "All of this should be green."
+ RenderText {#text} at (99,0) size 171x18
+ text run at (99,0) width 171: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock {HR} at (0,799) size 769x2 [border: (1px inset #000000)]
RenderBlock (anonymous) at (0,809) size 769x18
@@ -719,26 +719,26 @@
RenderBlock (anonymous) at (0,3036) size 769x18
RenderText {#text} at (0,0) size 61x18
text run at (0,0) width 61: "TABLE: "
- RenderInline {FONT} at (0,0) size 175x18 [color=#008000]
+ RenderInline {FONT} at (0,0) size 173x18 [color=#008000]
RenderInline {FONT} at (0,0) size 0x18 [color=#FF0000]
- RenderTable {TABLE} at (61,14) size 4x0
+ RenderTable {TABLE} at (61,14) size 2x0
RenderInline {FONT} at (0,0) size 171x18 [color=#FF0000]
- RenderText {#text} at (65,0) size 171x18
- text run at (65,0) width 171: "All of this should be green."
+ RenderText {#text} at (63,0) size 171x18
+ text run at (63,0) width 171: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,3062) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
RenderBlock (anonymous) at (0,3072) size 769x18
- RenderInline {FONT} at (0,0) size 240x18 [color=#008000]
+ RenderInline {FONT} at (0,0) size 238x18 [color=#008000]
RenderText {#text} at (0,0) size 65x18
text run at (0,0) width 65: "TBODY: "
- RenderInline {FONT} at (0,0) size 175x18
+ RenderInline {FONT} at (0,0) size 173x18
RenderInline {FONT} at (0,0) size 0x18
- RenderTable {TABLE} at (65,12) size 4x2
- RenderTableSection {TBODY} at (0,0) size 4x2
+ RenderTable {TABLE} at (65,12) size 2x2
+ RenderTableSection {TBODY} at (0,0) size 2x2
RenderInline {FONT} at (0,0) size 171x18
- RenderText {#text} at (69,0) size 171x18
- text run at (69,0) width 171: "All of this should be green."
+ RenderText {#text} at (67,0) size 171x18
+ text run at (67,0) width 171: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,3098) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
@@ -759,51 +759,51 @@
RenderBlock (anonymous) at (0,3134) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
RenderBlock (anonymous) at (0,3144) size 769x18
- RenderInline {FONT} at (0,0) size 236x18 [color=#008000]
- RenderInline {FONT} at (0,0) size 236x18
+ RenderInline {FONT} at (0,0) size 234x18 [color=#008000]
+ RenderInline {FONT} at (0,0) size 234x18
RenderText {#text} at (0,0) size 61x18
text run at (0,0) width 61: "TFOOT: "
- RenderInline {FONT} at (0,0) size 175x18
+ RenderInline {FONT} at (0,0) size 173x18
RenderInline {FONT} at (0,0) size 0x18
- RenderTable {TABLE} at (61,12) size 4x2
- RenderTableSection {TFOOT} at (0,0) size 4x2
+ RenderTable {TABLE} at (61,12) size 2x2
+ RenderTableSection {TFOOT} at (0,0) size 2x2
RenderInline {FONT} at (0,0) size 171x18
- RenderText {#text} at (65,0) size 171x18
- text run at (65,0) width 171: "All of this should be green."
+ RenderText {#text} at (63,0) size 171x18
+ text run at (63,0) width 171: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,3170) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
RenderBlock (anonymous) at (0,3180) size 769x18
- RenderInline {FONT} at (0,0) size 239x18 [color=#008000]
- RenderInline {FONT} at (0,0) size 239x18
- RenderInline {FONT} at (0,0) size 239x18
+ RenderInline {FONT} at (0,0) size 237x18 [color=#008000]
+ RenderInline {FONT} at (0,0) size 237x18
+ RenderInline {FONT} at (0,0) size 237x18
RenderText {#text} at (0,0) size 64x18
text run at (0,0) width 64: "THEAD: "
- RenderInline {FONT} at (0,0) size 175x18
+ RenderInline {FONT} at (0,0) size 173x18
RenderInline {FONT} at (0,0) size 0x18
- RenderTable {TABLE} at (64,12) size 4x2
- RenderTableSection {THEAD} at (0,0) size 4x2
+ RenderTable {TABLE} at (64,12) size 2x2
+ RenderTableSection {THEAD} at (0,0) size 2x2
RenderInline {FONT} at (0,0) size 171x18
- RenderText {#text} at (68,0) size 171x18
- text run at (68,0) width 171: "All of this should be green."
+ RenderText {#text} at (66,0) size 171x18
+ text run at (66,0) width 171: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,3206) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
RenderBlock (anonymous) at (0,3216) size 769x18
- RenderInline {FONT} at (0,0) size 204x18 [color=#008000]
- RenderInline {FONT} at (0,0) size 204x18
- RenderInline {FONT} at (0,0) size 204x18
- RenderInline {FONT} at (0,0) size 204x18
+ RenderInline {FONT} at (0,0) size 202x18 [color=#008000]
+ RenderInline {FONT} at (0,0) size 202x18
+ RenderInline {FONT} at (0,0) size 202x18
+ RenderInline {FONT} at (0,0) size 202x18
RenderText {#text} at (0,0) size 29x18
text run at (0,0) width 29: "TR: "
- RenderInline {FONT} at (0,0) size 175x18
+ RenderInline {FONT} at (0,0) size 173x18
RenderInline {FONT} at (0,0) size 0x18
- RenderTable {TABLE} at (29,10) size 4x4
- RenderTableSection {TBODY} at (0,0) size 4x4
- RenderTableRow {TR} at (0,2) size 4x0
+ RenderTable {TABLE} at (29,10) size 2x4
+ RenderTableSection {TBODY} at (0,0) size 2x4
+ RenderTableRow {TR} at (0,2) size 2x0
RenderInline {FONT} at (0,0) size 171x18
- RenderText {#text} at (33,0) size 171x18
- text run at (33,0) width 171: "All of this should be green."
+ RenderText {#text} at (31,0) size 171x18
+ text run at (31,0) width 171: "All of this should be green."
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,3242) size 769x2 [color=#008000]
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
Modified: trunk/LayoutTests/platform/mac/fast/invalid/table-inside-stray-table-content-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/fast/invalid/table-inside-stray-table-content-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/fast/invalid/table-inside-stray-table-content-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -9,7 +9,7 @@
RenderBlock {DIV} at (0,34) size 784x84 [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 48x30 [border: (2px outset #808080)]
RenderTableSection {TBODY} at (2,2) size 44x26
RenderTableRow {TR} at (0,2) size 44x22
Modified: trunk/LayoutTests/platform/mac/fast/table/inline-form-assert-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/fast/table/inline-form-assert-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/fast/table/inline-form-assert-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -18,9 +18,9 @@
RenderBlock {P} at (0,34) size 784x18
RenderText {#text} at (0,0) size 175x18
text run at (0,0) width 175: "No assert means test PASS."
- RenderTable {TABLE} at (0,68) size 4x0
- RenderTable {TABLE} at (0,68) size 4x2
- RenderTableSection {TBODY} at (0,0) size 4x2
+ RenderTable {TABLE} at (0,68) size 2x0
+ RenderTable {TABLE} at (0,68) size 2x2
+ RenderTableSection {TBODY} at (0,0) size 2x2
RenderTable {TABLE} at (0,70) size 5x4
RenderTableSection {THEAD} at (0,0) size 5x4
RenderTableRow (anonymous) at (0,2) size 5x0
@@ -31,6 +31,6 @@
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,78) size 4x4
- RenderTableSection {TBODY} at (0,0) size 4x4
- RenderTableRow {TR} at (0,2) size 4x0
+ RenderTable {TABLE} at (0,78) size 2x4
+ RenderTableSection {TBODY} at (0,0) size 2x4
+ RenderTableRow {TR} at (0,2) size 2x0
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-2-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-2-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-2-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -15,8 +15,8 @@
RenderInline {A} at (0,0) size 169x22
RenderText {#text} at (0,0) size 169x22
text run at (0,0) width 169: "Table of Contents"
- RenderTable {TABLE} at (0,39) size 4x4
- RenderTableSection {TBODY} at (0,0) size 4x4
- RenderTableRow {TR} at (0,2) size 4x0
+ RenderTable {TABLE} at (0,39) size 2x4
+ RenderTableSection {TBODY} at (0,0) size 2x4
+ RenderTableRow {TR} at (0,2) size 2x0
RenderBlock (anonymous) at (0,74) size 784x0
RenderInline {FONT} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug23994-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug23994-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug23994-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -6,5 +6,5 @@
RenderBlock (anonymous) at (0,0) size 784x18
RenderText {#text} at (0,0) size 9x18
text run at (0,0) width 9: ">"
- RenderTable {TABLE} at (0,18) size 4x0
- RenderBlock {CAPTION} at (0,0) size 4x0
+ RenderTable {TABLE} at (0,18) size 2x0
+ RenderBlock {CAPTION} at (0,0) size 2x0
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug56405-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug56405-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug56405-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -3,7 +3,7 @@
layer at (0,0) size 785x1136
RenderBlock {HTML} at (0,0) size 785x1136
RenderBody {BODY} at (8,8) size 769x1120
- RenderTable {TABLE} at (0,0) size 4x1078
+ RenderTable {TABLE} at (0,0) size 2x1078
RenderTable {TABLE} at (0,1078) size 102x24
RenderTableSection {TBODY} at (0,0) size 102x24
RenderTableRow {TR} at (0,2) size 102x20
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug56563-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug56563-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug56563-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug56563-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -13,4 +13,4 @@
RenderBlock {P} at (0,34) size 784x40
RenderImage {IMG} at (0,0) size 126x40
RenderText {#text} at (0,0) size 0x0
- RenderTable {TABLE} at (0,90) size 6x2 [border: (1px outset #808080)]
+ RenderTable {TABLE} at (0,90) size 4x2 [border: (1px outset #808080)]
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug9024-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug9024-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug9024-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -4,5 +4,5 @@
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
Modified: trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -6,10 +6,10 @@
RenderTable {TABLE} at (0,0) size 800x36 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 798x34
RenderTableRow {TR} at (0,3) size 798x28
- RenderTableCell {TD} at (3,3) size 40x28 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=10]
+ RenderTableCell {TD} at (3,3) size 41x28 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=10]
RenderText {#text} at (5,5) size 12x18
text run at (5,5) width 12: "A"
- RenderTableCell {TD} at (46,3) size 218x28 [border: (1px inset #808080)] [r=0 c=10 rs=1 cs=50]
+ RenderTableCell {TD} at (47,3) size 217x28 [border: (1px inset #808080)] [r=0 c=10 rs=1 cs=50]
RenderText {#text} at (5,5) size 11x18
text run at (5,5) width 11: "B"
RenderTableCell {TD} at (267,3) size 528x28 [border: (1px inset #808080)] [r=0 c=60 rs=1 cs=120]
Modified: trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7121-2-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7121-2-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7121-2-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7121-2-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -3,15 +3,15 @@
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 294x24
- RenderTableSection {TBODY} at (0,0) size 294x24
- RenderTableRow {TR} at (0,2) size 294x20
- RenderTableCell {TD} at (2,2) size 3x20 [bgcolor=#000000] [r=0 c=0 rs=1 cs=15]
+ RenderTable {TABLE} at (0,0) size 293x24
+ RenderTableSection {TBODY} at (0,0) size 293x24
+ RenderTableRow {TR} at (0,2) size 293x20
+ RenderTableCell {TD} at (2,2) size 2x20 [bgcolor=#000000] [r=0 c=0 rs=1 cs=15]
RenderBR {BR} at (1,1) size 0x18
- RenderTableCell {TD} at (7,2) size 281x17 [bgcolor=#000000] [r=0 c=15 rs=1 cs=1]
+ RenderTableCell {TD} at (6,2) size 281x17 [bgcolor=#000000] [r=0 c=15 rs=1 cs=1]
RenderInline {FONT} at (0,0) size 279x15 [color=#AAAAAA]
RenderText {#text} at (1,1) size 279x15
text run at (1,1) width 279: "Copyright \x{A9} 1998-1999 The Mozilla Organization."
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (290,2) size 2x20 [bgcolor=#000000] [r=0 c=16 rs=1 cs=15]
+ RenderTableCell {TD} at (289,2) size 2x20 [bgcolor=#000000] [r=0 c=16 rs=1 cs=15]
RenderBR {BR} at (1,1) size 0x18
Modified: trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/conflicts-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/conflicts-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/conflicts-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -151,17 +151,17 @@
RenderTable {TABLE} at (0,656) size 300x52 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 298x50
RenderTableRow {TR} at (0,2) size 298x22
- RenderTableCell {TD} at (2,2) size 147x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,2) size 146x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 44x18
text run at (2,2) width 44: "50CS2"
- RenderTableCell {TD} at (151,2) size 145x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (150,2) size 146x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 27x18
text run at (2,2) width 27: "auto"
RenderTableRow {TR} at (0,26) size 298x22
- RenderTableCell {TD} at (2,26) size 147x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,26) size 146x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 57x18
text run at (2,2) width 57: "50%CS2"
- RenderTableCell {TD} at (151,26) size 145x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (150,26) size 146x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 27x18
text run at (2,2) width 27: "auto"
RenderBlock (anonymous) at (0,708) size 769x36
@@ -171,17 +171,17 @@
RenderTable {TABLE} at (0,744) size 300x52 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 298x50
RenderTableRow {TR} at (0,2) size 298x22
- RenderTableCell {TD} at (2,2) size 89x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,2) size 87x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 52x18
text run at (2,2) width 52: "100CS2"
- RenderTableCell {TD} at (93,2) size 203x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (91,2) size 205x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 20x18
text run at (2,2) width 20: "bar"
RenderTableRow {TR} at (0,26) size 298x22
- RenderTableCell {TD} at (2,26) size 89x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,26) size 87x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 57x18
text run at (2,2) width 57: "30%CS2"
- RenderTableCell {TD} at (93,26) size 203x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (91,26) size 205x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 20x18
text run at (2,2) width 20: "bar"
RenderBlock (anonymous) at (0,796) size 769x36
@@ -191,17 +191,17 @@
RenderTable {TABLE} at (0,832) size 769x52 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 767x50
RenderTableRow {TR} at (0,2) size 767x22
- RenderTableCell {TD} at (2,2) size 77x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,2) size 76x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 52x18
text run at (2,2) width 52: "500CS2"
- RenderTableCell {TD} at (81,2) size 684x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (80,2) size 685x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 27x18
text run at (2,2) width 27: "atuo"
RenderTableRow {TR} at (0,26) size 767x22
- RenderTableCell {TD} at (2,26) size 77x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,26) size 76x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 57x18
text run at (2,2) width 57: "10%CS2"
- RenderTableCell {TD} at (81,26) size 684x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (80,26) size 685x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 27x18
text run at (2,2) width 27: "auto"
RenderBlock (anonymous) at (0,884) size 769x36
Modified: trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/empty_cells-expected.txt (96572 => 96573)
--- trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/empty_cells-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/empty_cells-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -341,15 +341,15 @@
RenderBlock (anonymous) at (0,0) size 769x18
RenderText {#text} at (0,0) size 430x18
text run at (0,0) width 430: "this table should be about 38 pixels wide (colspan=4, cellspacing=2)"
- RenderTable {TABLE} at (0,18) 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,18) 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,26) size 769x18
RenderBR {BR} at (0,0) size 0x18
RenderBlock {P} at (0,952) size 769x44
Modified: trunk/LayoutTests/tables/mozilla_expected_failures/bugs/bug3517-expected.txt (96572 => 96573)
--- trunk/LayoutTests/tables/mozilla_expected_failures/bugs/bug3517-expected.txt 2011-10-04 06:22:14 UTC (rev 96572)
+++ trunk/LayoutTests/tables/mozilla_expected_failures/bugs/bug3517-expected.txt 2011-10-04 06:42:36 UTC (rev 96573)
@@ -4,5 +4,5 @@
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
