From 2adf0628bda9c22a02472e7696ab363e769edbfa Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 3 Feb 2011 16:39:31 -0500
Subject: [PATCH] Bug 540360 - Split the borderhandling-rules-border.html
 reftest into multiple individual tests to prevent it from failing
 intermittently; r=bernd a=test-only

---
 ...rhandling-rules-border-all-quirks-ref.html | 59 ++++++++++++++++++
 ...orderhandling-rules-border-all-quirks.html | 53 ++++++++++++++++
 ...rhandling-rules-border-all-strict-ref.html | 60 ++++++++++++++++++
 ...orderhandling-rules-border-all-strict.html | 54 ++++++++++++++++
 ...handling-rules-border-cols-quirks-ref.html | 60 ++++++++++++++++++
 ...rderhandling-rules-border-cols-quirks.html | 55 +++++++++++++++++
 ...handling-rules-border-cols-strict-ref.html | 61 +++++++++++++++++++
 ...rderhandling-rules-border-cols-strict.html | 56 +++++++++++++++++
 ...andling-rules-border-empty-quirks-ref.html | 58 ++++++++++++++++++
 ...derhandling-rules-border-empty-quirks.html | 52 ++++++++++++++++
 ...andling-rules-border-empty-strict-ref.html | 59 ++++++++++++++++++
 ...derhandling-rules-border-empty-strict.html | 53 ++++++++++++++++
 ...ndling-rules-border-groups-quirks-ref.html | 59 ++++++++++++++++++
 ...erhandling-rules-border-groups-quirks.html | 53 ++++++++++++++++
 ...ndling-rules-border-groups-strict-ref.html | 60 ++++++++++++++++++
 ...erhandling-rules-border-groups-strict.html | 54 ++++++++++++++++
 ...handling-rules-border-none-quirks-ref.html | 59 ++++++++++++++++++
 ...rderhandling-rules-border-none-quirks.html | 53 ++++++++++++++++
 ...handling-rules-border-none-strict-ref.html | 60 ++++++++++++++++++
 ...rderhandling-rules-border-none-strict.html | 54 ++++++++++++++++
 ...handling-rules-border-rows-quirks-ref.html | 59 ++++++++++++++++++
 ...rderhandling-rules-border-rows-quirks.html | 53 ++++++++++++++++
 ...handling-rules-border-rows-strict-ref.html | 60 ++++++++++++++++++
 ...rderhandling-rules-border-rows-strict.html | 54 ++++++++++++++++
 ...andling-rules-border-rules-quirks-ref.html | 58 ++++++++++++++++++
 ...derhandling-rules-border-rules-quirks.html | 52 ++++++++++++++++
 ...andling-rules-border-rules-strict-ref.html | 59 ++++++++++++++++++
 ...derhandling-rules-border-rules-strict.html | 53 ++++++++++++++++
 .../table-bordercollapse/reftest.list         | 15 ++++-
 29 files changed, 1594 insertions(+), 1 deletion(-)
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-all-quirks-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-all-quirks.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-all-strict-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-all-strict.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-quirks-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-quirks.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-strict-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-strict.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-quirks-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-quirks.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-strict-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-strict.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-quirks-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-quirks.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-strict-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-strict.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-none-quirks-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-none-quirks.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-none-strict-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-none-strict.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-quirks-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-quirks.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-strict-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-strict.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-quirks-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-quirks.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-strict-ref.html
 create mode 100644 layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-strict.html

diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-quirks-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-quirks-ref.html
new file mode 100644
index 000000000000..63d2ddb58730
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-quirks-ref.html
@@ -0,0 +1,59 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="all"</th>
+<td>
+<table class="bc">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc">
+  <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 3px; border-style: outset">
+  <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-quirks.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-quirks.html
new file mode 100644
index 000000000000..ada9045c47e8
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-quirks.html
@@ -0,0 +1,53 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="all"</th>
+<td>
+<table rules="all">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="all" border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="all" border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="all" border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="all" border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-strict-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-strict-ref.html
new file mode 100644
index 000000000000..4e339a62573c
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-strict-ref.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="all"</th>
+<td>
+<table class="bc">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc">
+  <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 3px; border-style: outset">
+  <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-strict.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-strict.html
new file mode 100644
index 000000000000..01af55802ab2
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-all-strict.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="all"</th>
+<td>
+<table rules="all">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="all" border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="all" border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="all" border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="all" border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-quirks-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-quirks-ref.html
new file mode 100644
index 000000000000..5cf82c073e69
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-quirks-ref.html
@@ -0,0 +1,60 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="cols"</th>
+<td>
+<table table class="bc" >
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table table class="bc" >
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table table class="bc" style="border-width: 3px; border-style: outset">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-quirks.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-quirks.html
new file mode 100644
index 000000000000..349eb0d76ac5
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-quirks.html
@@ -0,0 +1,55 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="cols"</th>
+<td>
+<table rules="cols">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="cols" border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="cols" border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="cols" border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="cols" border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-strict-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-strict-ref.html
new file mode 100644
index 000000000000..e0fedb031367
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-strict-ref.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="cols"</th>
+<td>
+<table table class="bc" >
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table table class="bc" >
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table table class="bc" style="border-width: 3px; border-style: outset">
+   <colgroup><col class="bcborder"><col class="bcborder"></colgroup>
+   <colgroup><col class="bcborder"></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-strict.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-strict.html
new file mode 100644
index 000000000000..198018dda5db
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-cols-strict.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="cols"</th>
+<td>
+<table rules="cols">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="cols" border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="cols" border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="cols" border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="cols" border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-quirks-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-quirks-ref.html
new file mode 100644
index 000000000000..757dec0980b0
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-quirks-ref.html
@@ -0,0 +1,58 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>empty</th>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner" style="border-width:3px">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-quirks.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-quirks.html
new file mode 100644
index 000000000000..b564d5fcf045
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-quirks.html
@@ -0,0 +1,52 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>empty</th>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-strict-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-strict-ref.html
new file mode 100644
index 000000000000..9c32a6697e80
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-strict-ref.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>empty</th>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner" style="border-width:3px">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-strict.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-strict.html
new file mode 100644
index 000000000000..55e7443c6ef6
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-empty-strict.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>empty</th>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-quirks-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-quirks-ref.html
new file mode 100644
index 000000000000..553cda44da24
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-quirks-ref.html
@@ -0,0 +1,59 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="groups"</th>
+<td>
+<table class="bc">
+   <colgroup class="bcborder"><col><col></colgroup>
+   <colgroup class="bcborder"><col></colgroup>
+   <thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup class="bcborder"><col><col></colgroup>
+   <colgroup class="bcborder"><col></colgroup>
+   <thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc">
+   <colgroup class="bcborder"><col><col></colgroup>
+   <colgroup class="bcborder"><col></colgroup>
+   <thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup class="bcborder"><col><col></colgroup>
+   <colgroup class="bcborder"><col></colgroup>
+   <thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 3px; border-style: outset">
+   <colgroup class="bcborder"><col><col></colgroup>
+   <colgroup class="bcborder"><col></colgroup>
+   <thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-quirks.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-quirks.html
new file mode 100644
index 000000000000..1af52c7c2dbc
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-quirks.html
@@ -0,0 +1,53 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="groups"</th>
+<td>
+<table rules="groups">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="groups" border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="groups" border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="groups" border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="groups" border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-strict-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-strict-ref.html
new file mode 100644
index 000000000000..c729ace871cd
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-strict-ref.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="groups"</th>
+<td>
+<table class="bc">
+   <colgroup class="bcborder"><col><col></colgroup>
+   <colgroup class="bcborder"><col></colgroup>
+   <thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup class="bcborder"><col><col></colgroup>
+   <colgroup class="bcborder"><col></colgroup>
+   <thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc">
+   <colgroup class="bcborder"><col><col></colgroup>
+   <colgroup class="bcborder"><col></colgroup>
+   <thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup class="bcborder"><col><col></colgroup>
+   <colgroup class="bcborder"><col></colgroup>
+   <thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 3px; border-style: outset">
+   <colgroup class="bcborder"><col><col></colgroup>
+   <colgroup class="bcborder"><col></colgroup>
+   <thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-strict.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-strict.html
new file mode 100644
index 000000000000..96393bc2fb4a
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-groups-strict.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="groups"</th>
+<td>
+<table rules="groups">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="groups" border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="groups" border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="groups" border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="groups" border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-quirks-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-quirks-ref.html
new file mode 100644
index 000000000000..cf5af7f865eb
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-quirks-ref.html
@@ -0,0 +1,59 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="none"</th>
+<td>
+<table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame" style="border-width:3px">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-quirks.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-quirks.html
new file mode 100644
index 000000000000..e35724e0f4bf
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-quirks.html
@@ -0,0 +1,53 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="none"</th>
+<td>
+<table rules="none">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="none" border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="none" border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="none" border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="none" border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-strict-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-strict-ref.html
new file mode 100644
index 000000000000..9034914185dc
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-strict-ref.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="none"</th>
+<td>
+<table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame" style="border-width:3px">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-strict.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-strict.html
new file mode 100644
index 000000000000..535c51ec69a4
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-none-strict.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="none"</th>
+<td>
+<table rules="none">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="none" border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="none" border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="none" border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="none" border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-quirks-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-quirks-ref.html
new file mode 100644
index 000000000000..526bbe4b864c
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-quirks-ref.html
@@ -0,0 +1,59 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="rows"</th>
+<td>
+<table class="bc">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc">
+  <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 3px; border-style: outset">
+  <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-quirks.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-quirks.html
new file mode 100644
index 000000000000..030f79e2e1db
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-quirks.html
@@ -0,0 +1,53 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="rows"</th>
+<td>
+<table rules="rows">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="rows" border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="rows" border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="rows" border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="rows" border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-strict-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-strict-ref.html
new file mode 100644
index 000000000000..3e1dc1579a42
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-strict-ref.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="rows"</th>
+<td>
+<table class="bc">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc">
+  <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 1px; border-style: solid">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="bc" style="border-width: 3px; border-style: outset">
+  <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-strict.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-strict.html
new file mode 100644
index 000000000000..233ba687af95
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rows-strict.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules="rows"</th>
+<td>
+<table rules="rows">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="rows" border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="rows" border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="rows" border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules="rows" border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-quirks-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-quirks-ref.html
new file mode 100644
index 000000000000..0d0c073eda42
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-quirks-ref.html
@@ -0,0 +1,58 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules</th>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner" style="border-width:3px">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-quirks.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-quirks.html
new file mode 100644
index 000000000000..66083fa27b35
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-quirks.html
@@ -0,0 +1,52 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules</th>
+<td><table rules>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-strict-ref.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-strict-ref.html
new file mode 100644
index 000000000000..4cb1641131a6
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-strict-ref.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+div {width: 3px; height: 3px;}
+table.frame {border-style: outset; border-width: thin ;}
+
+table.bc{ border-collapse:collapse; border-style: hidden}
+.bcborder {border-width: 1px; border-style: solid}
+td.inner {border-style: inset; border-width: thin;}
+table.inner td {border-style: inset; border-width: thin;}
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules</th>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table class="frame inner" style="border-width:3px">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-strict.html b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-strict.html
new file mode 100644
index 000000000000..7b3d30c9a779
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/borderhandling-rules-border-rules-strict.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<style>
+div {width: 3px; height: 3px;}
+
+</style>
+</head>
+<body>
+<table cellpadding="5" rules="all">
+<tr><th>rules/border</th><th>empty</th><th>border</th><th>border="0"</th><th>border="1"</th><th>border="3"</th></tr>
+<tr><th>rules</th>
+<td><table rules>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules border>
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules border="0">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules border="1">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+<td><table rules border="3">
+   <colgroup><col><col></colgroup>
+   <colgroup><col></colgroup>
+   <thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
+   <tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
+   <tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
+</table></td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/layout/reftests/table-bordercollapse/reftest.list b/layout/reftests/table-bordercollapse/reftest.list
index ed99450db635..45b277a08948 100644
--- a/layout/reftests/table-bordercollapse/reftest.list
+++ b/layout/reftests/table-bordercollapse/reftest.list
@@ -74,7 +74,20 @@ fails-if(cocoaWidget) == bc_borderoffset2.html bc_borderoffset2_ref.html # bug 4
 == borderhandling-7.xhtml borderhandling-strict-ref.html
 == borderhandling-8.html borderhandling-strict-ref.html
 == borderhandling-frame-border.html borderhandling-frame-border-ref.html
-random == borderhandling-rules-border.html borderhandling-rules-border-ref.html # bug 540360 (depends on bug 540256)
+== borderhandling-rules-border-empty-quirks.html borderhandling-rules-border-empty-quirks-ref.html
+== borderhandling-rules-border-rules-quirks.html borderhandling-rules-border-rules-quirks-ref.html
+== borderhandling-rules-border-none-quirks.html borderhandling-rules-border-none-quirks-ref.html
+== borderhandling-rules-border-groups-quirks.html borderhandling-rules-border-groups-quirks-ref.html
+== borderhandling-rules-border-rows-quirks.html borderhandling-rules-border-rows-quirks-ref.html
+== borderhandling-rules-border-cols-quirks.html borderhandling-rules-border-cols-quirks-ref.html
+== borderhandling-rules-border-all-quirks.html borderhandling-rules-border-all-quirks-ref.html
+== borderhandling-rules-border-empty-strict.html borderhandling-rules-border-empty-strict-ref.html
+== borderhandling-rules-border-rules-strict.html borderhandling-rules-border-rules-strict-ref.html
+== borderhandling-rules-border-none-strict.html borderhandling-rules-border-none-strict-ref.html
+== borderhandling-rules-border-groups-strict.html borderhandling-rules-border-groups-strict-ref.html
+== borderhandling-rules-border-rows-strict.html borderhandling-rules-border-rows-strict-ref.html
+== borderhandling-rules-border-cols-strict.html borderhandling-rules-border-cols-strict-ref.html
+== borderhandling-rules-border-all-strict.html borderhandling-rules-border-all-strict-ref.html
 == bordercolor-1.html bordercolor-ref.html
 != bordercolor-2.html bordercolor-ref.html
 == bordercolor-3.html bordercolor-3-ref.html