diff --git a/layout/html/tests/table/bugs/bug1302.html b/layout/html/tests/table/bugs/bug1302.html
new file mode 100644
index 00000000000..216404ff8f1
--- /dev/null
+++ b/layout/html/tests/table/bugs/bug1302.html
@@ -0,0 +1,161 @@
+
+
+
+
+
Tables I, II, III, IV (cellpadding=0 cellspacing=5)
+
+
+
+
+
+ Table I
+
+ 1,1 | 1,2 | 1,3 | 1,4 | 1,5 |
+
+
+ 2,1 | 2,2 | 2,3 | 2,4 | 2,5 |
+
+
+ 3,1 | 3,2 | 3,3 | 3,4 | 3,5 |
+
+
+
+ |
+
+
+ Table II
+
+ 1,1 | 1,2 | 1,4 | 1,5 |
+
+
+ 2,1 | 2,2 | 2,3 | 2,5 |
+
+
+ 3,1 | 3,2 | 3,3 | 3,4 | 3,5 |
+
+
+
+ |
+
+
+ Table III
+
+ 1,1 | 1,2 | 1,4 | 1,5 |
+
+
+ 2,1 | 2,2 | 2,3 | 2,5 |
+
+
+ 3,1 | | | | 3,5 |
+
+
+
+ |
+
+
+ Table IV
+
+ 1,1 | 1,2 | 1,4 | 1,5 |
+
+
+ 2,1 | 2,2 | 2,3 | 2,5 |
+
+
+
+ |
+
+
+
+
+This is a table colspan counting problem (IMHO).
+The oversize <TABLE> has two rows: one has *two* <TD>
+"requesting" total of 3 columns to span; second row has *one* <TD>
+"requesting" total of 3 columns to span. In other words, it's asking
+for one more column than the max number of 'real' elements in a row.
+
+Here's the simple case (first one shows the problem; the other adjusts the
+colspan values and it works) (Dec 19 Nightly Win 95): All the elements in
+the two tables below are width=auto (i.e., no width attribute specified).
+
+
+
+
+ This is colspan=2 |
+ Blah Blah Blah Blah Blah Blah |
+
+
+
+ This is colspan=3 blah blah blah blah blah
+ --- why doesn't this cell span the table (5.0 win95 jun17)?
+
+ |
+
+
+
+
+
+ This is colspan=1 |
+ Blah Blah Blah Blah Blah Blah |
+
+
+
+ This is colspan=2 blah blah blah blah blah
+ --- this cell spans the table correctly.
+
+ |
+
+
+
+
+
+ Here's the test case from bug #2645.
+
+This test case (below) is derived from home.netscape.com (although
+not much is left). [This was the table structure for "Autos ... Local
+..." and the right-hand column ("ABCNews.com..."); added an extra column
+to differentiate this example a bit more from the one above].
+
+ The basic problem is "competing colspan requests". The table has two rows,
+both of which have COLSPAN requests. They are both asking for one more column
+than the max number of 'real' elements in either row (i.e., both ask for total
+of 5 but the maximum number of TD in either row is 4). This seems to confuse the
+algorithm. ;) (Note: all the column elements in these two tables are width=fixed
+except the TD with colspan=(4|3)).
+
+
+
+
+
+x |
+ this (colspan=2) |
+ blue |
+ that |
+
+
+x |
+ blue (colspan=4) --- doesn't span (5.0 win95 jun17) |
+
+
+Here's the same table but the 'colspan' values have been normalized.
+
+
+
+
+x |
+ this (colspan=1) |
+ blue |
+ that |
+
+
+x |
+ blue (colspan=3) --- spans correctly |
+
+
+
+
+
+
+
+
+
+
diff --git a/layout/html/tests/table/bugs/bug2509.html b/layout/html/tests/table/bugs/bug2509.html
new file mode 100644
index 00000000000..e21b6f84724
--- /dev/null
+++ b/layout/html/tests/table/bugs/bug2509.html
@@ -0,0 +1,20 @@
+
+
+
+
+
+ What's New on WebDeveloper.com |
+ umm |
+
+ blah blah blah blah blah blah blah blah blah blah blah blah |
+ blah blah blah blah blah blah blah blah blah blah blah blah |
+
+
+
+
diff --git a/layout/html/tests/table/bugs/bug2684.html b/layout/html/tests/table/bugs/bug2684.html
new file mode 100644
index 00000000000..3ed7b58c465
--- /dev/null
+++ b/layout/html/tests/table/bugs/bug2684.html
@@ -0,0 +1,65 @@
+
+
+
+(1) Colspanning TD has fixed width equal to table width
+
+
+
+ width=340 (same as table) |
+
+
+ Search for: |
+ foo bar baz foo bar baz foo bar baz |
+
+
+
+(2) Colspanning TD has auto width
+
+
+
+ no width attribute |
+
+
+ Search for: |
+ foo bar baz foo bar baz foo bar baz |
+
+
+
+(3) Colspanning TD has width=100px
+
+
+
+ width=100px |
+
+
+ Search for: |
+ foo bar baz foo bar baz foo bar baz |
+
+
+
+(4) Colspanning TD has width=200px
+
+
+
+ width=200px |
+
+
+ Search for: |
+ foo bar baz foo bar baz foo bar baz |
+
+
+
+(5) Colspanning TD has width=100%
+
+
+
+ width=100% |
+
+
+ Search for: |
+ foo bar baz foo bar baz foo bar baz |
+
+
+
+
+
diff --git a/layout/html/tests/table/bugs/bug2773.html b/layout/html/tests/table/bugs/bug2773.html
new file mode 100644
index 00000000000..3ed7b58c465
--- /dev/null
+++ b/layout/html/tests/table/bugs/bug2773.html
@@ -0,0 +1,65 @@
+
+
+
+(1) Colspanning TD has fixed width equal to table width
+
+
+
+ width=340 (same as table) |
+
+
+ Search for: |
+ foo bar baz foo bar baz foo bar baz |
+
+
+
+(2) Colspanning TD has auto width
+
+
+
+ no width attribute |
+
+
+ Search for: |
+ foo bar baz foo bar baz foo bar baz |
+
+
+
+(3) Colspanning TD has width=100px
+
+
+
+ width=100px |
+
+
+ Search for: |
+ foo bar baz foo bar baz foo bar baz |
+
+
+
+(4) Colspanning TD has width=200px
+
+
+
+ width=200px |
+
+
+ Search for: |
+ foo bar baz foo bar baz foo bar baz |
+
+
+
+(5) Colspanning TD has width=100%
+
+
+
+ width=100% |
+
+
+ Search for: |
+ foo bar baz foo bar baz foo bar baz |
+
+
+
+
+
diff --git a/layout/html/tests/table/bugs/bug2973.html b/layout/html/tests/table/bugs/bug2973.html
new file mode 100644
index 00000000000..93057ffea0d
--- /dev/null
+++ b/layout/html/tests/table/bugs/bug2973.html
@@ -0,0 +1,12 @@
+
+
+
+
+
+ inside of table |
+
+
+ |
+ 2nd row of outside table |
+
+
diff --git a/layout/html/tests/table/bugs/bug650.html b/layout/html/tests/table/bugs/bug650.html
new file mode 100644
index 00000000000..f8773c7f2d7
--- /dev/null
+++ b/layout/html/tests/table/bugs/bug650.html
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. |
+This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. |
+
+
+
+
+
diff --git a/layout/html/tests/table/bugs/file_list.txt b/layout/html/tests/table/bugs/file_list.txt
index a0b9b15ef48..3fe2804cd9d 100644
--- a/layout/html/tests/table/bugs/file_list.txt
+++ b/layout/html/tests/table/bugs/file_list.txt
@@ -9,6 +9,7 @@ file://s:/mozilla/layout/html/tests/table/bugs/bug1224.html
file://s:/mozilla/layout/html/tests/table/bugs/bug1261.html
file://s:/mozilla/layout/html/tests/table/bugs/bug1262.html
file://s:/mozilla/layout/html/tests/table/bugs/bug1296.html
+file://s:/mozilla/layout/html/tests/table/bugs/bug1302.html
file://s:/mozilla/layout/html/tests/table/bugs/bug1318.html
file://s:/mozilla/layout/html/tests/table/bugs/bug1430.html
file://s:/mozilla/layout/html/tests/table/bugs/bug1474.html
@@ -28,11 +29,15 @@ file://s:/mozilla/layout/html/tests/table/bugs/bug2123.html
file://s:/mozilla/layout/html/tests/table/bugs/bug2267.html
file://s:/mozilla/layout/html/tests/table/bugs/bug2296.html
file://s:/mozilla/layout/html/tests/table/bugs/bug2469.html
+file://s:/mozilla/layout/html/tests/table/bugs/bug2509.html
file://s:/mozilla/layout/html/tests/table/bugs/bug2516.html
file://s:/mozilla/layout/html/tests/table/bugs/bug2585.html
+file://s:/mozilla/layout/html/tests/table/bugs/bug2684.html
file://s:/mozilla/layout/html/tests/table/bugs/bug2757.html
file://s:/mozilla/layout/html/tests/table/bugs/bug2763.html
+file://s:/mozilla/layout/html/tests/table/bugs/bug2773.html
file://s:/mozilla/layout/html/tests/table/bugs/bug2962.html
+file://s:/mozilla/layout/html/tests/table/bugs/bug2973.html
file://s:/mozilla/layout/html/tests/table/bugs/bug2981-1.html
file://s:/mozilla/layout/html/tests/table/bugs/bug2981-2.html
file://s:/mozilla/layout/html/tests/table/bugs/bug3037-1.html
@@ -57,6 +62,7 @@ file://s:/mozilla/layout/html/tests/table/bugs/bug641-1.html
file://s:/mozilla/layout/html/tests/table/bugs/bug641-2.html
file://s:/mozilla/layout/html/tests/table/bugs/bug6404.html
file://s:/mozilla/layout/html/tests/table/bugs/bug647.html
+file://s:/mozilla/layout/html/tests/table/bugs/bug650.html
file://s:/mozilla/layout/html/tests/table/bugs/bug6933.html
file://s:/mozilla/layout/html/tests/table/bugs/bug709.html
file://s:/mozilla/layout/html/tests/table/bugs/bug7243.html