[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
mrobinson at webkit.org
mrobinson at webkit.org
Sun Feb 20 23:56:37 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 1ce4a060d027df42679cc2e44a538236b05ed6d1
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 27 01:12:07 2011 +0000
2011-01-26 Martin Robinson <mrobinson at igalia.com>
Add the final set of CSS 2.1 GTK+ baselines.
* platform/gtk/Skipped: Unskip the remaining CSS 2.1 tests.
* platform/gtk/css2.1: Add the remaining baselines.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76740 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9ba901d..96d3b46 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,12 @@
2011-01-26 Martin Robinson <mrobinson at igalia.com>
+ Add the final set of CSS 2.1 GTK+ baselines.
+
+ * platform/gtk/Skipped: Unskip the remaining CSS 2.1 tests.
+ * platform/gtk/css2.1: Add the remaining baselines.
+
+2011-01-26 Martin Robinson <mrobinson at igalia.com>
+
Add the next set of GTK+ baselines for the CSS 2.1 test suite.
* platform/gtk/Skipped: Unskip the next block of tests.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 31688f6..d0a6943 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -100,96 +100,6 @@ accessibility/table-with-aria-role.html
accessibility/table-with-rules.html
accessibility/aria-list-and-listitem.html
-# Tests in css2.1/ directory
-# Tests generating new results
-css2.1/t170602-bdr-conflct-w-13-d.html
-css2.1/t170602-bdr-conflct-w-14-d.html
-css2.1/t170602-bdr-conflct-w-15-d.html
-css2.1/t170602-bdr-conflct-w-16-d.html
-css2.1/t170602-bdr-conflct-w-17-d.html
-css2.1/t170602-bdr-conflct-w-18-d.html
-css2.1/t170602-bdr-conflct-w-19-d.html
-css2.1/t170602-bdr-conflct-w-20-d.html
-css2.1/t170602-bdr-conflct-w-21-d.html
-css2.1/t170602-bdr-conflct-w-22-d.html
-css2.1/t170602-bdr-conflct-w-23-d.html
-css2.1/t170602-bdr-conflct-w-24-d.html
-css2.1/t170602-bdr-conflct-w-25-d.html
-css2.1/t170602-bdr-conflct-w-26-d.html
-css2.1/t170602-bdr-conflct-w-27-d.html
-css2.1/t170602-bdr-conflct-w-28-d.html
-css2.1/t170602-bdr-conflct-w-29-d.html
-css2.1/t170602-bdr-conflct-w-30-d.html
-css2.1/t170602-bdr-conflct-w-31-d.html
-css2.1/t170602-bdr-conflct-w-32-d.html
-css2.1/t170602-bdr-conflct-w-33-d.html
-css2.1/t170602-bdr-conflct-w-34-d.html
-css2.1/t170602-bdr-conflct-w-35-d.html
-css2.1/t170602-bdr-conflct-w-36-d.html
-css2.1/t170602-bdr-conflct-w-37-d.html
-css2.1/t170602-bdr-conflct-w-38-d.html
-css2.1/t170602-bdr-conflct-w-39-d.html
-css2.1/t170602-bdr-conflct-w-40-d.html
-css2.1/t170602-bdr-conflct-w-41-d.html
-css2.1/t170602-bdr-conflct-w-42-d.html
-css2.1/t170602-bdr-conflct-w-43-d.html
-css2.1/t170602-bdr-conflct-w-44-d.html
-css2.1/t170602-bdr-conflct-w-45-d.html
-css2.1/t170602-bdr-conflct-w-46-d.html
-css2.1/t170602-bdr-conflct-w-47-d.html
-css2.1/t170602-bdr-conflct-w-48-d.html
-css2.1/t170602-bdr-conflct-w-49-d.html
-css2.1/t170602-bdr-conflct-w-50-d.html
-css2.1/t170602-bdr-conflct-w-51-d.html
-css2.1/t170602-bdr-conflct-w-52-d.html
-css2.1/t170602-bdr-conflct-w-53-d.html
-css2.1/t170602-bdr-conflct-w-54-d.html
-css2.1/t170602-bdr-conflct-w-55-d.html
-css2.1/t170602-bdr-conflct-w-56-d.html
-css2.1/t170602-bdr-conflct-w-57-d.html
-css2.1/t170602-bdr-conflct-w-58-d.html
-css2.1/t170602-bdr-conflct-w-59-d.html
-css2.1/t170602-bdr-conflct-w-60-d.html
-css2.1/t170602-bdr-conflct-w-61-d.html
-css2.1/t170602-bdr-conflct-w-62-d.html
-css2.1/t170602-bdr-conflct-w-63-d.html
-css2.1/t170602-bdr-conflct-w-64-d.html
-css2.1/t170602-bdr-conflct-w-65-d.html
-css2.1/t170602-bdr-conflct-w-66-d.html
-css2.1/t170602-bdr-conflct-w-67-d.html
-css2.1/t170602-bdr-conflct-w-68-d.html
-css2.1/t170602-bdr-conflct-w-69-d.html
-css2.1/t170602-bdr-conflct-w-70-d.html
-css2.1/t170602-bdr-conflct-w-71-d.html
-css2.1/t170602-bdr-conflct-w-72-d.html
-css2.1/t170602-bdr-conflct-w-73-d.html
-css2.1/t170602-bdr-conflct-w-74-d.html
-css2.1/t170602-bdr-conflct-w-75-d.html
-css2.1/t170602-bdr-conflct-w-76-d.html
-css2.1/t170602-bdr-conflct-w-77-d.html
-css2.1/t170602-bdr-conflct-w-78-d.html
-css2.1/t170602-bdr-conflct-w-79-d.html
-css2.1/t170602-bdr-conflct-w-80-d.html
-css2.1/t170602-bdr-conflct-w-81-d.html
-css2.1/t170602-bdr-conflct-w-82-d.html
-css2.1/t170602-bdr-conflct-w-83-d.html
-css2.1/t170602-bdr-conflct-w-84-d.html
-css2.1/t170602-bdr-conflct-w-85-d.html
-css2.1/t170602-bdr-conflct-w-86-d.html
-css2.1/t170602-bdr-conflct-w-87-d.html
-css2.1/t170602-bdr-conflct-w-88-d.html
-css2.1/t170602-bdr-conflct-w-89-d.html
-css2.1/t170602-bdr-conflct-w-90-d.html
-css2.1/t170602-bdr-conflct-w-91-d.html
-css2.1/t170602-bdr-conflct-w-92-d.html
-css2.1/t170602-bdr-conflct-w-93-d.html
-css2.1/t170602-bdr-conflct-w-94-d.html
-css2.1/t170602-bdr-conflct-w-95-d.html
-css2.1/t170602-bdr-conflct-w-96-d.html
-css2.1/t170602-bdr-conflct-w-97-d.html
-css2.1/t170602-bdr-conflct-w-98-d.html
-css2.1/t170602-bdr-conflct-w-99-d.html
-
# Tests in editing/ directory
# Tests failing
editing/inserting/5994480-2.html
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.checksum
new file mode 100644
index 0000000..81a3ced
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.checksum
@@ -0,0 +1 @@
+9ef37acfe7a621f3fb5b9e0c8861ab2a
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.png
new file mode 100644
index 0000000..9a0a562
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.txt
new file mode 100644
index 0000000..205ecbb
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 167x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 162x175
+ RenderTableRow {TR} at (0,0) size 162x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,14) size 55x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (109,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,58) size 162x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 43x19
+ text run at (6,6) width 43: "double"
+ RenderTableCell {TD} at (109,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,118) size 162x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,132) size 55x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "dashed"
+ RenderTableCell {TD} at (109,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.checksum
new file mode 100644
index 0000000..c203d01
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.checksum
@@ -0,0 +1 @@
+6dabf431a2242cec86c405d0db71678f
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.png
new file mode 100644
index 0000000..a63d436
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.txt
new file mode 100644
index 0000000..f902f77
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 157x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 152x175
+ RenderTableRow {TR} at (0,0) size 152x58
+ RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,14) size 55x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (104,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,58) size 152x60
+ RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 43x19
+ text run at (6,6) width 43: "double"
+ RenderTableCell {TD} at (104,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 39x19
+ text run at (6,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,118) size 152x57
+ RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,132) size 55x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 39x19
+ text run at (4,6) width 39: "dotted"
+ RenderTableCell {TD} at (104,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.checksum
new file mode 100644
index 0000000..db571ac
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.checksum
@@ -0,0 +1 @@
+68f2469b44db296435c591cbc083b2b2
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.png
new file mode 100644
index 0000000..50da670
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.txt
new file mode 100644
index 0000000..51ba740
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 143x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 138x175
+ RenderTableRow {TR} at (0,0) size 138x58
+ RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,14) size 55x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (97,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,58) size 138x60
+ RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 43x19
+ text run at (6,6) width 43: "double"
+ RenderTableCell {TD} at (97,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 32x19
+ text run at (6,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,118) size 138x57
+ RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,132) size 55x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 32x19
+ text run at (4,6) width 32: "ridge"
+ RenderTableCell {TD} at (97,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.checksum
new file mode 100644
index 0000000..220d377
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.checksum
@@ -0,0 +1 @@
+6b9cdff100b7bedbb2852b6e69c87817
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.png
new file mode 100644
index 0000000..f9abd5e
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.txt
new file mode 100644
index 0000000..eca7527
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 153x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 148x175
+ RenderTableRow {TR} at (0,0) size 148x58
+ RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,14) size 55x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (102,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableRow {TR} at (0,58) size 148x60
+ RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 43x19
+ text run at (6,6) width 43: "double"
+ RenderTableCell {TD} at (102,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 37x19
+ text run at (6,4) width 37: "outset"
+ RenderTableRow {TR} at (0,118) size 148x57
+ RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,132) size 55x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 37x19
+ text run at (4,6) width 37: "outset"
+ RenderTableCell {TD} at (102,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.checksum
new file mode 100644
index 0000000..e98b23b
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.checksum
@@ -0,0 +1 @@
+10a1d327436dc3adaac876ee763ba931
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.png
new file mode 100644
index 0000000..ff1b7ac
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.txt
new file mode 100644
index 0000000..43cc929
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 167x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 162x175
+ RenderTableRow {TR} at (0,0) size 162x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,14) size 55x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (109,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableRow {TR} at (0,58) size 162x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 43x19
+ text run at (6,6) width 43: "double"
+ RenderTableCell {TD} at (109,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "groove"
+ RenderTableRow {TR} at (0,118) size 162x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,132) size 55x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "groove"
+ RenderTableCell {TD} at (109,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.checksum
new file mode 100644
index 0000000..7f10556
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.checksum
@@ -0,0 +1 @@
+2f9d23a49a179232544966f6d44d3cdd
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.png
new file mode 100644
index 0000000..ca4e630
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.txt
new file mode 100644
index 0000000..e2a4ae8
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 137x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 132x175
+ RenderTableRow {TR} at (0,0) size 132x58
+ RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,14) size 55x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (94,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableRow {TR} at (0,58) size 132x60
+ RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 43x19
+ text run at (6,6) width 43: "double"
+ RenderTableCell {TD} at (94,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 29x19
+ text run at (6,4) width 29: "inset"
+ RenderTableRow {TR} at (0,118) size 132x57
+ RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,132) size 55x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 29x19
+ text run at (4,6) width 29: "inset"
+ RenderTableCell {TD} at (94,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.checksum
new file mode 100644
index 0000000..a97cd79
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.checksum
@@ -0,0 +1 @@
+e235fe94ac2f8a20378c8635b002e0dc
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.png
new file mode 100644
index 0000000..d00eb3c
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.txt
new file mode 100644
index 0000000..83b4331
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 131x170
+ RenderTableSection {TBODY} at (0,0) size 131x170
+ RenderTableRow {TR} at (0,0) size 131x55
+ RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,14) size 55x26 [border: none] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (93,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableRow {TR} at (0,55) size 131x60
+ RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,69) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 43x19
+ text run at (6,6) width 43: "double"
+ RenderTableCell {TD} at (93,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,1) size 31x19
+ text run at (6,1) width 31: "none"
+ RenderTableRow {TR} at (0,115) size 131x55
+ RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,129) size 55x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,6) size 31x19
+ text run at (1,6) width 31: "none"
+ RenderTableCell {TD} at (93,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.checksum
new file mode 100644
index 0000000..3604b41
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.checksum
@@ -0,0 +1 @@
+9153ae02b7e68d9395f9b76131a15402
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.png
new file mode 100644
index 0000000..9d4c928
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.txt
new file mode 100644
index 0000000..d568786
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x209
+ RenderBlock {HTML} at (0,0) size 800x209
+ RenderBody {BODY} at (8,16) size 784x185
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 135x150
+ RenderTableSection {TBODY} at (0,0) size 135x150
+ RenderTableRow {TR} at (0,0) size 135x50
+ RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,50) size 135x50
+ RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 30x19
+ text run at (1,1) width 30: "solid"
+ RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,100) size 135x50
+ RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.checksum
new file mode 100644
index 0000000..d4041d7
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.checksum
@@ -0,0 +1 @@
+a433f11f2e94ce0807e97ec0e154cade
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.png
new file mode 100644
index 0000000..a39c71d
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.txt
new file mode 100644
index 0000000..f01095d
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 155x175
+ RenderTableRow {TR} at (0,0) size 155x58
+ RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,14) size 50x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableRow {TR} at (0,58) size 155x60
+ RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,72) size 50x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 30x19
+ text run at (6,6) width 30: "solid"
+ RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 43x19
+ text run at (6,4) width 43: "double"
+ RenderTableRow {TR} at (0,118) size 155x57
+ RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,132) size 50x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 43x19
+ text run at (4,6) width 43: "double"
+ RenderTableCell {TD} at (103,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.checksum
new file mode 100644
index 0000000..b4b3f03
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.checksum
@@ -0,0 +1 @@
+4da8b6eb708f75d66242590bd03ade1c
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.png
new file mode 100644
index 0000000..8e55741
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.txt
new file mode 100644
index 0000000..a21cbe3
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 126x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 121x175
+ RenderTableRow {TR} at (0,0) size 121x58
+ RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,14) size 42x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (82,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableRow {TR} at (0,58) size 121x60
+ RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,72) size 42x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 30x19
+ text run at (6,6) width 30: "solid"
+ RenderTableCell {TD} at (82,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 30x19
+ text run at (6,4) width 30: "solid"
+ RenderTableRow {TR} at (0,118) size 121x57
+ RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,132) size 42x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 30x19
+ text run at (4,6) width 30: "solid"
+ RenderTableCell {TD} at (82,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.checksum
new file mode 100644
index 0000000..8d3a2f5
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.checksum
@@ -0,0 +1 @@
+321af63ec3dbeffbb426d44f5d96dece
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.png
new file mode 100644
index 0000000..20e55c2
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.txt
new file mode 100644
index 0000000..27c8b51
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 158x175
+ RenderTableRow {TR} at (0,0) size 158x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,14) size 51x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,58) size 158x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,72) size 51x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 30x19
+ text run at (6,6) width 30: "solid"
+ RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,118) size 158x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,132) size 51x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "dashed"
+ RenderTableCell {TD} at (105,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.checksum
new file mode 100644
index 0000000..23f1c96
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.checksum
@@ -0,0 +1 @@
+cf9170ec821f1ea2832911cc0fea102b
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.png
new file mode 100644
index 0000000..51f47ae
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.txt
new file mode 100644
index 0000000..d1b8ce6
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 148x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 143x175
+ RenderTableRow {TR} at (0,0) size 143x58
+ RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,14) size 46x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,58) size 143x60
+ RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,72) size 46x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 30x19
+ text run at (6,6) width 30: "solid"
+ RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 39x19
+ text run at (6,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,118) size 143x57
+ RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,132) size 46x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 39x19
+ text run at (4,6) width 39: "dotted"
+ RenderTableCell {TD} at (95,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.checksum
new file mode 100644
index 0000000..28a1039
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.checksum
@@ -0,0 +1 @@
+3478f4ed8face69eef51eb2c521546ec
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.png
new file mode 100644
index 0000000..3f257b3
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.txt
new file mode 100644
index 0000000..ba429ce
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 130x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 125x175
+ RenderTableRow {TR} at (0,0) size 125x58
+ RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,14) size 42x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (84,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,58) size 125x60
+ RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,72) size 42x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 30x19
+ text run at (6,6) width 30: "solid"
+ RenderTableCell {TD} at (84,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 32x19
+ text run at (6,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,118) size 125x57
+ RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,132) size 42x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 32x19
+ text run at (4,6) width 32: "ridge"
+ RenderTableCell {TD} at (84,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.checksum
new file mode 100644
index 0000000..49b3bc8
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.checksum
@@ -0,0 +1 @@
+766ff0fb0148476aad8d9ee7e7f4e743
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.png
new file mode 100644
index 0000000..5b714e0
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.txt
new file mode 100644
index 0000000..37c997a
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 142x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 137x175
+ RenderTableRow {TR} at (0,0) size 137x58
+ RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,14) size 44x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (91,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableRow {TR} at (0,58) size 137x60
+ RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,72) size 44x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 30x19
+ text run at (6,6) width 30: "solid"
+ RenderTableCell {TD} at (91,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 37x19
+ text run at (6,4) width 37: "outset"
+ RenderTableRow {TR} at (0,118) size 137x57
+ RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,132) size 44x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 37x19
+ text run at (4,6) width 37: "outset"
+ RenderTableCell {TD} at (91,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.checksum
new file mode 100644
index 0000000..eb974f9
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.checksum
@@ -0,0 +1 @@
+fd871a9d5dd9108bc3a4886a50d26fe2
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.png
new file mode 100644
index 0000000..f1daa78
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.txt
new file mode 100644
index 0000000..f626edb
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 158x175
+ RenderTableRow {TR} at (0,0) size 158x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,14) size 51x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableRow {TR} at (0,58) size 158x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,72) size 51x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 30x19
+ text run at (6,6) width 30: "solid"
+ RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "groove"
+ RenderTableRow {TR} at (0,118) size 158x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,132) size 51x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "groove"
+ RenderTableCell {TD} at (105,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.checksum
new file mode 100644
index 0000000..43aa0a3
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.checksum
@@ -0,0 +1 @@
+fac0c08ba85b7746ffe3e1d5a7f666ac
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.png
new file mode 100644
index 0000000..49c4389
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.txt
new file mode 100644
index 0000000..0910b95
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 124x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 119x175
+ RenderTableRow {TR} at (0,0) size 119x58
+ RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,14) size 42x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (81,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableRow {TR} at (0,58) size 119x60
+ RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,72) size 42x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 30x19
+ text run at (6,6) width 30: "solid"
+ RenderTableCell {TD} at (81,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 29x19
+ text run at (6,4) width 29: "inset"
+ RenderTableRow {TR} at (0,118) size 119x57
+ RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,132) size 42x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 29x19
+ text run at (4,6) width 29: "inset"
+ RenderTableCell {TD} at (81,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.checksum
new file mode 100644
index 0000000..0d1a1cb
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.checksum
@@ -0,0 +1 @@
+ebc883eb490c913a960470e2d9d7db46
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.png
new file mode 100644
index 0000000..04345a0
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.txt
new file mode 100644
index 0000000..c88eab8
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 118x170
+ RenderTableSection {TBODY} at (0,0) size 118x170
+ RenderTableRow {TR} at (0,0) size 118x55
+ RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,14) size 42x26 [border: none] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (80,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableRow {TR} at (0,55) size 118x60
+ RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,69) size 42x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 30x19
+ text run at (6,6) width 30: "solid"
+ RenderTableCell {TD} at (80,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,1) size 31x19
+ text run at (6,1) width 31: "none"
+ RenderTableRow {TR} at (0,115) size 118x55
+ RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,129) size 42x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,6) size 31x19
+ text run at (1,6) width 31: "none"
+ RenderTableCell {TD} at (80,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.checksum
new file mode 100644
index 0000000..00adc85
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.checksum
@@ -0,0 +1 @@
+a5ccc075d5e7f77740d18a1c90ec75b8
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.png
new file mode 100644
index 0000000..fb8d546
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.txt
new file mode 100644
index 0000000..cc65eee
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x209
+ RenderBlock {HTML} at (0,0) size 800x209
+ RenderBody {BODY} at (8,16) size 784x185
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 136x150
+ RenderTableSection {TBODY} at (0,0) size 136x150
+ RenderTableRow {TR} at (0,0) size 136x50
+ RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,14) size 46x21 [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (91,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,50) size 136x50
+ RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,64) size 46x21 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 44x19
+ text run at (1,1) width 44: "dashed"
+ RenderTableCell {TD} at (91,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,100) size 136x50
+ RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,114) size 46x21 [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (91,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.checksum
new file mode 100644
index 0000000..d63c8d7
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.checksum
@@ -0,0 +1 @@
+c77ea2e5e75406340f347e72d5b289c9
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.png
new file mode 100644
index 0000000..7606070
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.txt
new file mode 100644
index 0000000..2b46f49
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 166x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 161x175
+ RenderTableRow {TR} at (0,0) size 161x58
+ RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,14) size 56x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (109,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableRow {TR} at (0,58) size 161x60
+ RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "dashed"
+ RenderTableCell {TD} at (109,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 43x19
+ text run at (6,4) width 43: "double"
+ RenderTableRow {TR} at (0,118) size 161x57
+ RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,132) size 56x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 43x19
+ text run at (4,6) width 43: "double"
+ RenderTableCell {TD} at (109,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.checksum
new file mode 100644
index 0000000..00c0f30
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.checksum
@@ -0,0 +1 @@
+e5dc372360c101f4fabb5c7f4c27b023
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.png
new file mode 100644
index 0000000..f225536
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.txt
new file mode 100644
index 0000000..ade8632
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 140x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 135x175
+ RenderTableRow {TR} at (0,0) size 135x58
+ RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,14) size 56x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (96,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableRow {TR} at (0,58) size 135x60
+ RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "dashed"
+ RenderTableCell {TD} at (96,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 30x19
+ text run at (6,4) width 30: "solid"
+ RenderTableRow {TR} at (0,118) size 135x57
+ RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,132) size 56x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 30x19
+ text run at (4,6) width 30: "solid"
+ RenderTableCell {TD} at (96,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.checksum
new file mode 100644
index 0000000..2e1e373
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.checksum
@@ -0,0 +1 @@
+1a06ecedbaf0c3875c23890ebcef4a1c
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.png
new file mode 100644
index 0000000..7969420
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.txt
new file mode 100644
index 0000000..4c84114
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 168x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 163x175
+ RenderTableRow {TR} at (0,0) size 163x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,14) size 56x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (110,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,58) size 163x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "dashed"
+ RenderTableCell {TD} at (110,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,118) size 163x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,132) size 56x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "dashed"
+ RenderTableCell {TD} at (110,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.checksum
new file mode 100644
index 0000000..e0adf3d
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.checksum
@@ -0,0 +1 @@
+9f4f5ab362329eef77d08e17e856093c
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.png
new file mode 100644
index 0000000..791941a
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.txt
new file mode 100644
index 0000000..013b633
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 158x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 153x175
+ RenderTableRow {TR} at (0,0) size 153x58
+ RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,14) size 56x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (105,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,58) size 153x60
+ RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "dashed"
+ RenderTableCell {TD} at (105,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 39x19
+ text run at (6,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,118) size 153x57
+ RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,132) size 56x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 39x19
+ text run at (4,6) width 39: "dotted"
+ RenderTableCell {TD} at (105,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.checksum
new file mode 100644
index 0000000..7a2ecc3
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.checksum
@@ -0,0 +1 @@
+f93685a1890c669b56bd3924a989d69a
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.png
new file mode 100644
index 0000000..1467601
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.txt
new file mode 100644
index 0000000..02ebd52
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 144x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 139x175
+ RenderTableRow {TR} at (0,0) size 139x58
+ RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,14) size 56x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (98,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,58) size 139x60
+ RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "dashed"
+ RenderTableCell {TD} at (98,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 32x19
+ text run at (6,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,118) size 139x57
+ RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,132) size 56x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 32x19
+ text run at (4,6) width 32: "ridge"
+ RenderTableCell {TD} at (98,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.checksum
new file mode 100644
index 0000000..31acc36
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.checksum
@@ -0,0 +1 @@
+d4d08e242c22c0d91867b5b0ba570b55
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.png
new file mode 100644
index 0000000..c094403
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.txt
new file mode 100644
index 0000000..abc0ba6
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 154x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 149x175
+ RenderTableRow {TR} at (0,0) size 149x58
+ RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,14) size 56x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (103,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableRow {TR} at (0,58) size 149x60
+ RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "dashed"
+ RenderTableCell {TD} at (103,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 37x19
+ text run at (6,4) width 37: "outset"
+ RenderTableRow {TR} at (0,118) size 149x57
+ RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,132) size 56x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 37x19
+ text run at (4,6) width 37: "outset"
+ RenderTableCell {TD} at (103,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.checksum
new file mode 100644
index 0000000..09dd8f4
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.checksum
@@ -0,0 +1 @@
+afe08d73a51c5955f439052a4e092ac2
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.png
new file mode 100644
index 0000000..25f189b
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.txt
new file mode 100644
index 0000000..a9a70f9
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 168x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 163x175
+ RenderTableRow {TR} at (0,0) size 163x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,14) size 56x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (110,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableRow {TR} at (0,58) size 163x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "dashed"
+ RenderTableCell {TD} at (110,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "groove"
+ RenderTableRow {TR} at (0,118) size 163x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,132) size 56x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "groove"
+ RenderTableCell {TD} at (110,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.checksum
new file mode 100644
index 0000000..8b1dac6
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.checksum
@@ -0,0 +1 @@
+0f023cb19ca8c3feaa173eace0efc94f
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.png
new file mode 100644
index 0000000..6851958
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.txt
new file mode 100644
index 0000000..d730738
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 138x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 133x175
+ RenderTableRow {TR} at (0,0) size 133x58
+ RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,14) size 56x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (95,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableRow {TR} at (0,58) size 133x60
+ RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "dashed"
+ RenderTableCell {TD} at (95,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 29x19
+ text run at (6,4) width 29: "inset"
+ RenderTableRow {TR} at (0,118) size 133x57
+ RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,132) size 56x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 29x19
+ text run at (4,6) width 29: "inset"
+ RenderTableCell {TD} at (95,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.checksum
new file mode 100644
index 0000000..9a9ecc6
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.checksum
@@ -0,0 +1 @@
+4a3b99b62fc0188451b7ea2b97d294b9
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.png
new file mode 100644
index 0000000..197b35d
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.txt
new file mode 100644
index 0000000..103a3a6
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 132x170
+ RenderTableSection {TBODY} at (0,0) size 132x170
+ RenderTableRow {TR} at (0,0) size 132x55
+ RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,14) size 56x26 [border: none] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (94,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableRow {TR} at (0,55) size 132x60
+ RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,69) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "dashed"
+ RenderTableCell {TD} at (94,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,1) size 31x19
+ text run at (6,1) width 31: "none"
+ RenderTableRow {TR} at (0,115) size 132x55
+ RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,129) size 56x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,6) size 31x19
+ text run at (1,6) width 31: "none"
+ RenderTableCell {TD} at (94,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.checksum
new file mode 100644
index 0000000..43a6ecb
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.checksum
@@ -0,0 +1 @@
+d81dfdc6259217ab29f9ed8744b908bc
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.png
new file mode 100644
index 0000000..5409d94
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.txt
new file mode 100644
index 0000000..caa3793
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x209
+ RenderBlock {HTML} at (0,0) size 800x209
+ RenderBody {BODY} at (8,16) size 784x185
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 135x150
+ RenderTableSection {TBODY} at (0,0) size 135x150
+ RenderTableRow {TR} at (0,0) size 135x50
+ RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,50) size 135x50
+ RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 39x19
+ text run at (1,1) width 39: "dotted"
+ RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,100) size 135x50
+ RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.checksum
new file mode 100644
index 0000000..51edf55
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.checksum
@@ -0,0 +1 @@
+c2cb04fb87a4ca5fcc91322c6b2b292a
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.png
new file mode 100644
index 0000000..fce06cb
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.txt
new file mode 100644
index 0000000..d0993e8
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 161x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 156x175
+ RenderTableRow {TR} at (0,0) size 156x58
+ RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,14) size 51x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (104,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableRow {TR} at (0,58) size 156x60
+ RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 39x19
+ text run at (6,6) width 39: "dotted"
+ RenderTableCell {TD} at (104,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 43x19
+ text run at (6,4) width 43: "double"
+ RenderTableRow {TR} at (0,118) size 156x57
+ RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,132) size 51x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 43x19
+ text run at (4,6) width 43: "double"
+ RenderTableCell {TD} at (104,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.checksum
new file mode 100644
index 0000000..96cf426
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.checksum
@@ -0,0 +1 @@
+81eeb4f3f43d48ce101a7522a8d5373d
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.png
new file mode 100644
index 0000000..047e00e
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.txt
new file mode 100644
index 0000000..89e6bdb
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 135x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 130x175
+ RenderTableRow {TR} at (0,0) size 130x58
+ RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,14) size 51x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (91,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableRow {TR} at (0,58) size 130x60
+ RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 39x19
+ text run at (6,6) width 39: "dotted"
+ RenderTableCell {TD} at (91,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 30x19
+ text run at (6,4) width 30: "solid"
+ RenderTableRow {TR} at (0,118) size 130x57
+ RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,132) size 51x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 30x19
+ text run at (4,6) width 30: "solid"
+ RenderTableCell {TD} at (91,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.checksum
new file mode 100644
index 0000000..81c88cb
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.checksum
@@ -0,0 +1 @@
+61a55ec18c04e72a9b1b458ad33026a0
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.png
new file mode 100644
index 0000000..c57890d
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.txt
new file mode 100644
index 0000000..9607470
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 158x175
+ RenderTableRow {TR} at (0,0) size 158x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,14) size 51x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,58) size 158x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 39x19
+ text run at (6,6) width 39: "dotted"
+ RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,118) size 158x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,132) size 51x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "dashed"
+ RenderTableCell {TD} at (105,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.checksum
new file mode 100644
index 0000000..683cbd4
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.checksum
@@ -0,0 +1 @@
+b642d95894b2cd84ee62320646c714a3
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.png
new file mode 100644
index 0000000..beea912
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.txt
new file mode 100644
index 0000000..18bc8c6
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 153x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 148x175
+ RenderTableRow {TR} at (0,0) size 148x58
+ RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,14) size 51x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (100,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,58) size 148x60
+ RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 39x19
+ text run at (6,6) width 39: "dotted"
+ RenderTableCell {TD} at (100,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 39x19
+ text run at (6,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,118) size 148x57
+ RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,132) size 51x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 39x19
+ text run at (4,6) width 39: "dotted"
+ RenderTableCell {TD} at (100,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.checksum
new file mode 100644
index 0000000..c353836
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.checksum
@@ -0,0 +1 @@
+cd795cbe626e1d854e64e6a2a097d6b1
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.png
new file mode 100644
index 0000000..485ec5b
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.txt
new file mode 100644
index 0000000..1611471
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 139x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 134x175
+ RenderTableRow {TR} at (0,0) size 134x58
+ RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,14) size 51x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (93,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,58) size 134x60
+ RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 39x19
+ text run at (6,6) width 39: "dotted"
+ RenderTableCell {TD} at (93,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 32x19
+ text run at (6,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,118) size 134x57
+ RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,132) size 51x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 32x19
+ text run at (4,6) width 32: "ridge"
+ RenderTableCell {TD} at (93,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.checksum
new file mode 100644
index 0000000..bcac6c9
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.checksum
@@ -0,0 +1 @@
+95219991921634b1c7c9961d8ad02bb4
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.png
new file mode 100644
index 0000000..b8f77c3
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.txt
new file mode 100644
index 0000000..917b8af
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 149x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 144x175
+ RenderTableRow {TR} at (0,0) size 144x58
+ RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,14) size 51x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (98,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableRow {TR} at (0,58) size 144x60
+ RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 39x19
+ text run at (6,6) width 39: "dotted"
+ RenderTableCell {TD} at (98,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 37x19
+ text run at (6,4) width 37: "outset"
+ RenderTableRow {TR} at (0,118) size 144x57
+ RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,132) size 51x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 37x19
+ text run at (4,6) width 37: "outset"
+ RenderTableCell {TD} at (98,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.checksum
new file mode 100644
index 0000000..6e1bab3
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.checksum
@@ -0,0 +1 @@
+87dea6cfcffe63e1587f110ca43c9992
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.png
new file mode 100644
index 0000000..e1360b9
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.txt
new file mode 100644
index 0000000..f00f52e
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 158x175
+ RenderTableRow {TR} at (0,0) size 158x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,14) size 51x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableRow {TR} at (0,58) size 158x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 39x19
+ text run at (6,6) width 39: "dotted"
+ RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "groove"
+ RenderTableRow {TR} at (0,118) size 158x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,132) size 51x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "groove"
+ RenderTableCell {TD} at (105,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.checksum
new file mode 100644
index 0000000..865265a
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.checksum
@@ -0,0 +1 @@
+ca5887424384bfddb9fb0bd6e604e6be
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.png
new file mode 100644
index 0000000..d6b9aef
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.txt
new file mode 100644
index 0000000..a752cfe
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 133x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 128x175
+ RenderTableRow {TR} at (0,0) size 128x58
+ RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,14) size 51x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (90,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableRow {TR} at (0,58) size 128x60
+ RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 39x19
+ text run at (6,6) width 39: "dotted"
+ RenderTableCell {TD} at (90,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 29x19
+ text run at (6,4) width 29: "inset"
+ RenderTableRow {TR} at (0,118) size 128x57
+ RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,132) size 51x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 29x19
+ text run at (4,6) width 29: "inset"
+ RenderTableCell {TD} at (90,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.checksum
new file mode 100644
index 0000000..c89f560
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.checksum
@@ -0,0 +1 @@
+5bd11408386418ab21f774f0ccd03b2b
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.png
new file mode 100644
index 0000000..dbf9beb
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.txt
new file mode 100644
index 0000000..f15096e
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 127x170
+ RenderTableSection {TBODY} at (0,0) size 127x170
+ RenderTableRow {TR} at (0,0) size 127x55
+ RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,14) size 51x26 [border: none] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (89,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableRow {TR} at (0,55) size 127x60
+ RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,69) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 39x19
+ text run at (6,6) width 39: "dotted"
+ RenderTableCell {TD} at (89,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,1) size 31x19
+ text run at (6,1) width 31: "none"
+ RenderTableRow {TR} at (0,115) size 127x55
+ RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,129) size 51x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,6) size 31x19
+ text run at (1,6) width 31: "none"
+ RenderTableCell {TD} at (89,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.checksum
new file mode 100644
index 0000000..6bba88f
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.checksum
@@ -0,0 +1 @@
+e183f579c1482a21a8e81b820435604c
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.png
new file mode 100644
index 0000000..80cc144
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.txt
new file mode 100644
index 0000000..aafa3a2
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x209
+ RenderBlock {HTML} at (0,0) size 800x209
+ RenderBody {BODY} at (8,16) size 784x185
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 135x150
+ RenderTableSection {TBODY} at (0,0) size 135x150
+ RenderTableRow {TR} at (0,0) size 135x50
+ RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,50) size 135x50
+ RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 32x19
+ text run at (1,1) width 32: "ridge"
+ RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,100) size 135x50
+ RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.checksum
new file mode 100644
index 0000000..1f40eee
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.checksum
@@ -0,0 +1 @@
+0d54455b66b31776cdb433269d8aed12
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.png
new file mode 100644
index 0000000..07e8e2b
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.txt
new file mode 100644
index 0000000..e8b248d
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 155x175
+ RenderTableRow {TR} at (0,0) size 155x58
+ RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,14) size 50x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableRow {TR} at (0,58) size 155x60
+ RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,72) size 50x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 32x19
+ text run at (6,6) width 32: "ridge"
+ RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 43x19
+ text run at (6,4) width 43: "double"
+ RenderTableRow {TR} at (0,118) size 155x57
+ RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,132) size 50x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 43x19
+ text run at (4,6) width 43: "double"
+ RenderTableCell {TD} at (103,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.checksum
new file mode 100644
index 0000000..bf94d57
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.checksum
@@ -0,0 +1 @@
+55c40dfabb803666b050e37e1deb3a4c
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.png
new file mode 100644
index 0000000..6d71e71
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.txt
new file mode 100644
index 0000000..372756c
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 128x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 123x175
+ RenderTableRow {TR} at (0,0) size 123x58
+ RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,14) size 44x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (84,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableRow {TR} at (0,58) size 123x60
+ RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,72) size 44x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 32x19
+ text run at (6,6) width 32: "ridge"
+ RenderTableCell {TD} at (84,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 30x19
+ text run at (6,4) width 30: "solid"
+ RenderTableRow {TR} at (0,118) size 123x57
+ RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,132) size 44x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 30x19
+ text run at (4,6) width 30: "solid"
+ RenderTableCell {TD} at (84,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.checksum
new file mode 100644
index 0000000..d538195
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.checksum
@@ -0,0 +1 @@
+47ad266bfd625223d33980d4a6f23375
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.png
new file mode 100644
index 0000000..0acef8a
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.txt
new file mode 100644
index 0000000..8ee1234
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 158x175
+ RenderTableRow {TR} at (0,0) size 158x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,14) size 51x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,58) size 158x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,72) size 51x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 32x19
+ text run at (6,6) width 32: "ridge"
+ RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,118) size 158x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,132) size 51x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "dashed"
+ RenderTableCell {TD} at (105,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.checksum
new file mode 100644
index 0000000..56259a2
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.checksum
@@ -0,0 +1 @@
+44a2a9656da411adbe9fc628917e104c
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.png
new file mode 100644
index 0000000..8e031c5
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.txt
new file mode 100644
index 0000000..21268a9
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 148x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 143x175
+ RenderTableRow {TR} at (0,0) size 143x58
+ RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,14) size 46x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,58) size 143x60
+ RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,72) size 46x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 32x19
+ text run at (6,6) width 32: "ridge"
+ RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 39x19
+ text run at (6,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,118) size 143x57
+ RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,132) size 46x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 39x19
+ text run at (4,6) width 39: "dotted"
+ RenderTableCell {TD} at (95,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.checksum
new file mode 100644
index 0000000..3e34198
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.checksum
@@ -0,0 +1 @@
+ec29bd9566dd06c26d2d7aae81fa2168
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.png
new file mode 100644
index 0000000..2a49723
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.txt
new file mode 100644
index 0000000..a292921
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 132x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 127x175
+ RenderTableRow {TR} at (0,0) size 127x58
+ RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,14) size 44x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (86,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,58) size 127x60
+ RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,72) size 44x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 32x19
+ text run at (6,6) width 32: "ridge"
+ RenderTableCell {TD} at (86,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 32x19
+ text run at (6,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,118) size 127x57
+ RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,132) size 44x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 32x19
+ text run at (4,6) width 32: "ridge"
+ RenderTableCell {TD} at (86,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.checksum
new file mode 100644
index 0000000..0094ed3
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.checksum
@@ -0,0 +1 @@
+eda3647068228875c1a3b8cd619420a9
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.png
new file mode 100644
index 0000000..9ad74af
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.txt
new file mode 100644
index 0000000..39facd6
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 142x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 137x175
+ RenderTableRow {TR} at (0,0) size 137x58
+ RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,14) size 44x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (91,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableRow {TR} at (0,58) size 137x60
+ RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,72) size 44x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 32x19
+ text run at (6,6) width 32: "ridge"
+ RenderTableCell {TD} at (91,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 37x19
+ text run at (6,4) width 37: "outset"
+ RenderTableRow {TR} at (0,118) size 137x57
+ RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,132) size 44x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 37x19
+ text run at (4,6) width 37: "outset"
+ RenderTableCell {TD} at (91,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.checksum
new file mode 100644
index 0000000..b942b9b
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.checksum
@@ -0,0 +1 @@
+f8704f27505fdaaf01ed623b5405ba5c
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.png
new file mode 100644
index 0000000..111a7f6
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.txt
new file mode 100644
index 0000000..3139aa5
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 158x175
+ RenderTableRow {TR} at (0,0) size 158x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,14) size 51x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableRow {TR} at (0,58) size 158x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,72) size 51x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 32x19
+ text run at (6,6) width 32: "ridge"
+ RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "groove"
+ RenderTableRow {TR} at (0,118) size 158x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,132) size 51x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "groove"
+ RenderTableCell {TD} at (105,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.checksum
new file mode 100644
index 0000000..72b1675
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.checksum
@@ -0,0 +1 @@
+274a54a20e0b8fabab4309c6da3edac1
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.png
new file mode 100644
index 0000000..cd5f9bc
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.txt
new file mode 100644
index 0000000..5b5de78
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 126x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 121x175
+ RenderTableRow {TR} at (0,0) size 121x58
+ RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,14) size 44x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (83,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableRow {TR} at (0,58) size 121x60
+ RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,72) size 44x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 32x19
+ text run at (6,6) width 32: "ridge"
+ RenderTableCell {TD} at (83,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 29x19
+ text run at (6,4) width 29: "inset"
+ RenderTableRow {TR} at (0,118) size 121x57
+ RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,132) size 44x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 29x19
+ text run at (4,6) width 29: "inset"
+ RenderTableCell {TD} at (83,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.checksum
new file mode 100644
index 0000000..8fb73e1
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.checksum
@@ -0,0 +1 @@
+c0a92250985bacc2b2a7c0ca46204ea5
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.png
new file mode 100644
index 0000000..741edc2
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.txt
new file mode 100644
index 0000000..b275903
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 120x170
+ RenderTableSection {TBODY} at (0,0) size 120x170
+ RenderTableRow {TR} at (0,0) size 120x55
+ RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,14) size 44x26 [border: none] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (82,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableRow {TR} at (0,55) size 120x60
+ RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,69) size 44x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 32x19
+ text run at (6,6) width 32: "ridge"
+ RenderTableCell {TD} at (82,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,1) size 31x19
+ text run at (6,1) width 31: "none"
+ RenderTableRow {TR} at (0,115) size 120x55
+ RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,129) size 44x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,6) size 31x19
+ text run at (1,6) width 31: "none"
+ RenderTableCell {TD} at (82,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.checksum
new file mode 100644
index 0000000..5e9cb1b
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.checksum
@@ -0,0 +1 @@
+5e99907d5f85725469547be57bdaefc1
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.png
new file mode 100644
index 0000000..c7f4586
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.txt
new file mode 100644
index 0000000..e7d3829
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x209
+ RenderBlock {HTML} at (0,0) size 800x209
+ RenderBody {BODY} at (8,16) size 784x185
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 135x150
+ RenderTableSection {TBODY} at (0,0) size 135x150
+ RenderTableRow {TR} at (0,0) size 135x50
+ RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,50) size 135x50
+ RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 37x19
+ text run at (1,1) width 37: "outset"
+ RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,100) size 135x50
+ RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.checksum
new file mode 100644
index 0000000..e68ba6b
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.checksum
@@ -0,0 +1 @@
+61a23b6a7c0d17712f0dc5897061cd37
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.png
new file mode 100644
index 0000000..7a6d27c
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.txt
new file mode 100644
index 0000000..0f1c30a
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 155x175
+ RenderTableRow {TR} at (0,0) size 155x58
+ RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,14) size 50x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableRow {TR} at (0,58) size 155x60
+ RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,72) size 50x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 37x19
+ text run at (6,6) width 37: "outset"
+ RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 43x19
+ text run at (6,4) width 43: "double"
+ RenderTableRow {TR} at (0,118) size 155x57
+ RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,132) size 50x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 43x19
+ text run at (4,6) width 43: "double"
+ RenderTableCell {TD} at (103,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.checksum
new file mode 100644
index 0000000..bb4ba53
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.checksum
@@ -0,0 +1 @@
+cdacfb337f1d195d80fe7272dd0a88da
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.png
new file mode 100644
index 0000000..e5fad67
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.txt
new file mode 100644
index 0000000..64b5595
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 133x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 128x175
+ RenderTableRow {TR} at (0,0) size 128x58
+ RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,14) size 49x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (89,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableRow {TR} at (0,58) size 128x60
+ RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,72) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 37x19
+ text run at (6,6) width 37: "outset"
+ RenderTableCell {TD} at (89,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 30x19
+ text run at (6,4) width 30: "solid"
+ RenderTableRow {TR} at (0,118) size 128x57
+ RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,132) size 49x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 30x19
+ text run at (4,6) width 30: "solid"
+ RenderTableCell {TD} at (89,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.checksum
new file mode 100644
index 0000000..6154bbf
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.checksum
@@ -0,0 +1 @@
+f67793e02c629530cf8f8df6bc9b6093
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.png
new file mode 100644
index 0000000..1c79107
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.txt
new file mode 100644
index 0000000..8c05be0
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 158x175
+ RenderTableRow {TR} at (0,0) size 158x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,14) size 51x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,58) size 158x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,72) size 51x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 37x19
+ text run at (6,6) width 37: "outset"
+ RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,118) size 158x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,132) size 51x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "dashed"
+ RenderTableCell {TD} at (105,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.checksum
new file mode 100644
index 0000000..165dba4
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.checksum
@@ -0,0 +1 @@
+3dc58200fc575030141dd0ae521e7965
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.png
new file mode 100644
index 0000000..67f38c4
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.txt
new file mode 100644
index 0000000..077de46
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 151x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 146x175
+ RenderTableRow {TR} at (0,0) size 146x58
+ RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,14) size 49x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (98,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,58) size 146x60
+ RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,72) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 37x19
+ text run at (6,6) width 37: "outset"
+ RenderTableCell {TD} at (98,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 39x19
+ text run at (6,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,118) size 146x57
+ RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,132) size 49x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 39x19
+ text run at (4,6) width 39: "dotted"
+ RenderTableCell {TD} at (98,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.checksum
new file mode 100644
index 0000000..272a32b
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.checksum
@@ -0,0 +1 @@
+b91786148c3489005c49cbe6c44ed184
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.png
new file mode 100644
index 0000000..eca4bb1
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.txt
new file mode 100644
index 0000000..44dcb41
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 137x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 132x175
+ RenderTableRow {TR} at (0,0) size 132x58
+ RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,14) size 49x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (91,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,58) size 132x60
+ RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,72) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 37x19
+ text run at (6,6) width 37: "outset"
+ RenderTableCell {TD} at (91,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 32x19
+ text run at (6,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,118) size 132x57
+ RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,132) size 49x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 32x19
+ text run at (4,6) width 32: "ridge"
+ RenderTableCell {TD} at (91,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.checksum
new file mode 100644
index 0000000..4a33522
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.checksum
@@ -0,0 +1 @@
+1419b2ca84166a05de491d4fa6ebd85f
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.png
new file mode 100644
index 0000000..3933393
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.txt
new file mode 100644
index 0000000..2ee55df
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 147x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 142x175
+ RenderTableRow {TR} at (0,0) size 142x58
+ RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,14) size 49x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (96,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableRow {TR} at (0,58) size 142x60
+ RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,72) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 37x19
+ text run at (6,6) width 37: "outset"
+ RenderTableCell {TD} at (96,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 37x19
+ text run at (6,4) width 37: "outset"
+ RenderTableRow {TR} at (0,118) size 142x57
+ RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,132) size 49x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 37x19
+ text run at (4,6) width 37: "outset"
+ RenderTableCell {TD} at (96,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.checksum
new file mode 100644
index 0000000..8da7a3b
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.checksum
@@ -0,0 +1 @@
+05cc1155300c24cfa68bb428ab8f84a1
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.png
new file mode 100644
index 0000000..366113b
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.txt
new file mode 100644
index 0000000..81b7e5b
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 158x175
+ RenderTableRow {TR} at (0,0) size 158x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,14) size 51x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableRow {TR} at (0,58) size 158x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,72) size 51x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 37x19
+ text run at (6,6) width 37: "outset"
+ RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "groove"
+ RenderTableRow {TR} at (0,118) size 158x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,132) size 51x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "groove"
+ RenderTableCell {TD} at (105,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.checksum
new file mode 100644
index 0000000..8c0f3d2
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.checksum
@@ -0,0 +1 @@
+e08026ed9fab4ffa8a4b228b918710f4
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.png
new file mode 100644
index 0000000..53469ff
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.txt
new file mode 100644
index 0000000..6e81a7f
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 131x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 126x175
+ RenderTableRow {TR} at (0,0) size 126x58
+ RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,14) size 49x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (88,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableRow {TR} at (0,58) size 126x60
+ RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,72) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 37x19
+ text run at (6,6) width 37: "outset"
+ RenderTableCell {TD} at (88,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 29x19
+ text run at (6,4) width 29: "inset"
+ RenderTableRow {TR} at (0,118) size 126x57
+ RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,132) size 49x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 29x19
+ text run at (4,6) width 29: "inset"
+ RenderTableCell {TD} at (88,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.checksum
new file mode 100644
index 0000000..6d0cff5
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.checksum
@@ -0,0 +1 @@
+bb6293d5b502e3fe1a3b699ab76bc41e
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.png
new file mode 100644
index 0000000..1919483
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.txt
new file mode 100644
index 0000000..48a50a5
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 125x170
+ RenderTableSection {TBODY} at (0,0) size 125x170
+ RenderTableRow {TR} at (0,0) size 125x55
+ RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,14) size 49x26 [border: none] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (87,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableRow {TR} at (0,55) size 125x60
+ RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,69) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 37x19
+ text run at (6,6) width 37: "outset"
+ RenderTableCell {TD} at (87,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,1) size 31x19
+ text run at (6,1) width 31: "none"
+ RenderTableRow {TR} at (0,115) size 125x55
+ RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,129) size 49x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,6) size 31x19
+ text run at (1,6) width 31: "none"
+ RenderTableCell {TD} at (87,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.checksum
new file mode 100644
index 0000000..3ee27b1
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.checksum
@@ -0,0 +1 @@
+80adb2bc8fd06d8787c6db555d0ce2d5
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.png
new file mode 100644
index 0000000..526abe3
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.txt
new file mode 100644
index 0000000..00cfbf1
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x209
+ RenderBlock {HTML} at (0,0) size 800x209
+ RenderBody {BODY} at (8,16) size 784x185
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 136x150
+ RenderTableSection {TBODY} at (0,0) size 136x150
+ RenderTableRow {TR} at (0,0) size 136x50
+ RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,14) size 46x21 [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (91,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,50) size 136x50
+ RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,64) size 46x21 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 44x19
+ text run at (1,1) width 44: "groove"
+ RenderTableCell {TD} at (91,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,100) size 136x50
+ RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,114) size 46x21 [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (91,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.checksum
new file mode 100644
index 0000000..08cb8a4
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.checksum
@@ -0,0 +1 @@
+9378c7a690af720a402158ba7d9452b1
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.png
new file mode 100644
index 0000000..63a9c3a
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.txt
new file mode 100644
index 0000000..d5a4766
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 166x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 161x175
+ RenderTableRow {TR} at (0,0) size 161x58
+ RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,14) size 56x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (109,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableRow {TR} at (0,58) size 161x60
+ RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "groove"
+ RenderTableCell {TD} at (109,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 43x19
+ text run at (6,4) width 43: "double"
+ RenderTableRow {TR} at (0,118) size 161x57
+ RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,132) size 56x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 43x19
+ text run at (4,6) width 43: "double"
+ RenderTableCell {TD} at (109,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.checksum
new file mode 100644
index 0000000..0297e4c
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.checksum
@@ -0,0 +1 @@
+cf2fff4f900b773825108bd6112708ee
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.png
new file mode 100644
index 0000000..55b3600
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.txt
new file mode 100644
index 0000000..00461cd
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 140x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 135x175
+ RenderTableRow {TR} at (0,0) size 135x58
+ RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,14) size 56x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (96,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableRow {TR} at (0,58) size 135x60
+ RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "groove"
+ RenderTableCell {TD} at (96,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 30x19
+ text run at (6,4) width 30: "solid"
+ RenderTableRow {TR} at (0,118) size 135x57
+ RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,132) size 56x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 30x19
+ text run at (4,6) width 30: "solid"
+ RenderTableCell {TD} at (96,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.checksum
new file mode 100644
index 0000000..989ad1f
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.checksum
@@ -0,0 +1 @@
+d93f9f7dff1fa0d1ff3a1071d2ccf396
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.png
new file mode 100644
index 0000000..fd85eff
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.txt
new file mode 100644
index 0000000..f3c47a9
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 168x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 163x175
+ RenderTableRow {TR} at (0,0) size 163x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,14) size 56x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (110,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,58) size 163x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "groove"
+ RenderTableCell {TD} at (110,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,118) size 163x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,132) size 56x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "dashed"
+ RenderTableCell {TD} at (110,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.checksum
new file mode 100644
index 0000000..719850b
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.checksum
@@ -0,0 +1 @@
+680d4ff9ad299779721c215d1cff4591
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.png
new file mode 100644
index 0000000..33881ad
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.txt
new file mode 100644
index 0000000..9d52777
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 158x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 153x175
+ RenderTableRow {TR} at (0,0) size 153x58
+ RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,14) size 56x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (105,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,58) size 153x60
+ RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "groove"
+ RenderTableCell {TD} at (105,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 39x19
+ text run at (6,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,118) size 153x57
+ RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,132) size 56x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 39x19
+ text run at (4,6) width 39: "dotted"
+ RenderTableCell {TD} at (105,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.checksum
new file mode 100644
index 0000000..39bf114
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.checksum
@@ -0,0 +1 @@
+fd4ba4880ee0989a6001dab83d1d77b2
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.png
new file mode 100644
index 0000000..09abbe1
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.txt
new file mode 100644
index 0000000..0c7f2cd
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 144x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 139x175
+ RenderTableRow {TR} at (0,0) size 139x58
+ RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,14) size 56x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (98,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,58) size 139x60
+ RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "groove"
+ RenderTableCell {TD} at (98,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 32x19
+ text run at (6,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,118) size 139x57
+ RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,132) size 56x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 32x19
+ text run at (4,6) width 32: "ridge"
+ RenderTableCell {TD} at (98,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.checksum
new file mode 100644
index 0000000..a7d0a7a
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.checksum
@@ -0,0 +1 @@
+aa29c10378c63dcde180c63e05930726
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.png
new file mode 100644
index 0000000..ea632e4
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.txt
new file mode 100644
index 0000000..c3f1d27
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 154x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 149x175
+ RenderTableRow {TR} at (0,0) size 149x58
+ RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,14) size 56x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (103,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableRow {TR} at (0,58) size 149x60
+ RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "groove"
+ RenderTableCell {TD} at (103,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 37x19
+ text run at (6,4) width 37: "outset"
+ RenderTableRow {TR} at (0,118) size 149x57
+ RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,132) size 56x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 37x19
+ text run at (4,6) width 37: "outset"
+ RenderTableCell {TD} at (103,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.checksum
new file mode 100644
index 0000000..9fee962
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.checksum
@@ -0,0 +1 @@
+3f2eacd1bdec5ed90de57795884acbc4
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.png
new file mode 100644
index 0000000..f5baf58
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.txt
new file mode 100644
index 0000000..f670b5b
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 168x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 163x175
+ RenderTableRow {TR} at (0,0) size 163x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,14) size 56x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (110,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableRow {TR} at (0,58) size 163x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "groove"
+ RenderTableCell {TD} at (110,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "groove"
+ RenderTableRow {TR} at (0,118) size 163x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,132) size 56x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "groove"
+ RenderTableCell {TD} at (110,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.checksum
new file mode 100644
index 0000000..51cea87
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.checksum
@@ -0,0 +1 @@
+1044e12553504bb1c66f4a5be6f08f40
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.png
new file mode 100644
index 0000000..68b5caa
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.txt
new file mode 100644
index 0000000..1658482
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 138x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 133x175
+ RenderTableRow {TR} at (0,0) size 133x58
+ RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,14) size 56x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (95,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableRow {TR} at (0,58) size 133x60
+ RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "groove"
+ RenderTableCell {TD} at (95,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 29x19
+ text run at (6,4) width 29: "inset"
+ RenderTableRow {TR} at (0,118) size 133x57
+ RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,132) size 56x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 29x19
+ text run at (4,6) width 29: "inset"
+ RenderTableCell {TD} at (95,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.checksum
new file mode 100644
index 0000000..716f53a
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.checksum
@@ -0,0 +1 @@
+35307bfe4d2b9d4bdab79835c7c1f968
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.png
new file mode 100644
index 0000000..d3bcc3e
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.txt
new file mode 100644
index 0000000..26b3670
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 132x170
+ RenderTableSection {TBODY} at (0,0) size 132x170
+ RenderTableRow {TR} at (0,0) size 132x55
+ RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,14) size 56x26 [border: none] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (94,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableRow {TR} at (0,55) size 132x60
+ RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,69) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 44x19
+ text run at (6,6) width 44: "groove"
+ RenderTableCell {TD} at (94,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,1) size 31x19
+ text run at (6,1) width 31: "none"
+ RenderTableRow {TR} at (0,115) size 132x55
+ RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,129) size 56x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,6) size 31x19
+ text run at (1,6) width 31: "none"
+ RenderTableCell {TD} at (94,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.checksum
new file mode 100644
index 0000000..7736966
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.checksum
@@ -0,0 +1 @@
+c0aa2c67d6c2e1a8169912a8ec830ab5
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.png
new file mode 100644
index 0000000..49c051a
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.txt
new file mode 100644
index 0000000..a45ef42
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x209
+ RenderBlock {HTML} at (0,0) size 800x209
+ RenderBody {BODY} at (8,16) size 784x185
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 135x150
+ RenderTableSection {TBODY} at (0,0) size 135x150
+ RenderTableRow {TR} at (0,0) size 135x50
+ RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,50) size 135x50
+ RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 29x19
+ text run at (1,1) width 29: "inset"
+ RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,100) size 135x50
+ RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.checksum
new file mode 100644
index 0000000..f274695
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.checksum
@@ -0,0 +1 @@
+70cb0697389e0fa46c33aa5d8e1aab64
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.png
new file mode 100644
index 0000000..01a466e
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.txt
new file mode 100644
index 0000000..e4ac14c
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 155x175
+ RenderTableRow {TR} at (0,0) size 155x58
+ RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,14) size 50x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableRow {TR} at (0,58) size 155x60
+ RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,72) size 50x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 29x19
+ text run at (6,6) width 29: "inset"
+ RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 43x19
+ text run at (6,4) width 43: "double"
+ RenderTableRow {TR} at (0,118) size 155x57
+ RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (53,132) size 50x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 43x19
+ text run at (4,6) width 43: "double"
+ RenderTableCell {TD} at (103,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.checksum
new file mode 100644
index 0000000..cf6b86c
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.checksum
@@ -0,0 +1 @@
+a5cb5bdbebe1bcd7c60f96573c66944b
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.png
new file mode 100644
index 0000000..81b07c5
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.txt
new file mode 100644
index 0000000..181a7e2
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 125x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 120x175
+ RenderTableRow {TR} at (0,0) size 120x58
+ RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,14) size 41x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (81,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableRow {TR} at (0,58) size 120x60
+ RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,72) size 41x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 29x19
+ text run at (6,6) width 29: "inset"
+ RenderTableCell {TD} at (81,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 30x19
+ text run at (6,4) width 30: "solid"
+ RenderTableRow {TR} at (0,118) size 120x57
+ RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (40,132) size 41x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 30x19
+ text run at (4,6) width 30: "solid"
+ RenderTableCell {TD} at (81,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.checksum
new file mode 100644
index 0000000..6417660
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.checksum
@@ -0,0 +1 @@
+21be024e27fa36f79a49b07e133498a1
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.png
new file mode 100644
index 0000000..ba5f8db
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.txt
new file mode 100644
index 0000000..96bedc9
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 158x175
+ RenderTableRow {TR} at (0,0) size 158x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,14) size 51x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,58) size 158x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,72) size 51x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 29x19
+ text run at (6,6) width 29: "inset"
+ RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,118) size 158x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (54,132) size 51x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "dashed"
+ RenderTableCell {TD} at (105,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.checksum
new file mode 100644
index 0000000..9a411a2
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.checksum
@@ -0,0 +1 @@
+2178d902b7ae754e61b24f0b0d4d6cc6
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.png
new file mode 100644
index 0000000..2052f02
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.txt
new file mode 100644
index 0000000..a260777
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 148x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 143x175
+ RenderTableRow {TR} at (0,0) size 143x58
+ RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,14) size 46x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,58) size 143x60
+ RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,72) size 46x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 29x19
+ text run at (6,6) width 29: "inset"
+ RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 39x19
+ text run at (6,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,118) size 143x57
+ RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (49,132) size 46x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 39x19
+ text run at (4,6) width 39: "dotted"
+ RenderTableCell {TD} at (95,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.checksum
new file mode 100644
index 0000000..0a519e3
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.checksum
@@ -0,0 +1 @@
+dd90ba7daeaf82026b6b235d29926204
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.png
new file mode 100644
index 0000000..7135a50
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.txt
new file mode 100644
index 0000000..c959ce7
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 129x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 124x175
+ RenderTableRow {TR} at (0,0) size 124x58
+ RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,14) size 41x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (83,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,58) size 124x60
+ RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,72) size 41x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 29x19
+ text run at (6,6) width 29: "inset"
+ RenderTableCell {TD} at (83,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 32x19
+ text run at (6,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,118) size 124x57
+ RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (42,132) size 41x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 32x19
+ text run at (4,6) width 32: "ridge"
+ RenderTableCell {TD} at (83,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.checksum
new file mode 100644
index 0000000..f98abe7
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.checksum
@@ -0,0 +1 @@
+34c5346def0c7e9ccf04e42a423cf588
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.png
new file mode 100644
index 0000000..aaf01cd
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.txt
new file mode 100644
index 0000000..6520ac0
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 142x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 137x175
+ RenderTableRow {TR} at (0,0) size 137x58
+ RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,14) size 44x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (91,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableRow {TR} at (0,58) size 137x60
+ RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,72) size 44x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 29x19
+ text run at (6,6) width 29: "inset"
+ RenderTableCell {TD} at (91,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 37x19
+ text run at (6,4) width 37: "outset"
+ RenderTableRow {TR} at (0,118) size 137x57
+ RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (47,132) size 44x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 37x19
+ text run at (4,6) width 37: "outset"
+ RenderTableCell {TD} at (91,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.checksum
new file mode 100644
index 0000000..371cf65
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.checksum
@@ -0,0 +1 @@
+2069d65817fddebbb2926ee0fb3cb9af
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.png
new file mode 100644
index 0000000..9eb62a0
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.txt
new file mode 100644
index 0000000..0df1486
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 158x175
+ RenderTableRow {TR} at (0,0) size 158x58
+ RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,14) size 51x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableRow {TR} at (0,58) size 158x60
+ RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,72) size 51x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 29x19
+ text run at (6,6) width 29: "inset"
+ RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 44x19
+ text run at (6,4) width 44: "groove"
+ RenderTableRow {TR} at (0,118) size 158x57
+ RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (54,132) size 51x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 44x19
+ text run at (4,6) width 44: "groove"
+ RenderTableCell {TD} at (105,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.checksum
new file mode 100644
index 0000000..e500498
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.checksum
@@ -0,0 +1 @@
+43327ee831d3d7eb353e86400d566cce
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.png
new file mode 100644
index 0000000..d9357f0
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.txt
new file mode 100644
index 0000000..f838fe6
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x239
+ RenderBlock {HTML} at (0,0) size 800x239
+ RenderBody {BODY} at (8,16) size 784x215
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 123x180 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 118x175
+ RenderTableRow {TR} at (0,0) size 118x58
+ RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,14) size 41x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (80,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableRow {TR} at (0,58) size 118x60
+ RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,72) size 41x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 29x19
+ text run at (6,6) width 29: "inset"
+ RenderTableCell {TD} at (80,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,4) size 29x19
+ text run at (6,4) width 29: "inset"
+ RenderTableRow {TR} at (0,118) size 118x57
+ RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (39,132) size 41x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,6) size 29x19
+ text run at (4,6) width 29: "inset"
+ RenderTableCell {TD} at (80,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.checksum
new file mode 100644
index 0000000..f019836
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.checksum
@@ -0,0 +1 @@
+c42497e3909d0497a1ecaa6dbc303df8
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.png
new file mode 100644
index 0000000..5162368
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.txt
new file mode 100644
index 0000000..42d7160
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 117x170
+ RenderTableSection {TBODY} at (0,0) size 117x170
+ RenderTableRow {TR} at (0,0) size 117x55
+ RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,14) size 41x26 [border: none] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (79,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableRow {TR} at (0,55) size 117x60
+ RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,69) size 41x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (6,6) size 29x19
+ text run at (6,6) width 29: "inset"
+ RenderTableCell {TD} at (79,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (6,1) size 31x19
+ text run at (6,1) width 31: "none"
+ RenderTableRow {TR} at (0,115) size 117x55
+ RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (38,129) size 41x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,6) size 31x19
+ text run at (1,6) width 31: "none"
+ RenderTableCell {TD} at (79,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.checksum
new file mode 100644
index 0000000..2795d6e
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.checksum
@@ -0,0 +1 @@
+145b5c362aa51d1c973897754438f6d5
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.png
new file mode 100644
index 0000000..3d64822
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.txt
new file mode 100644
index 0000000..c2ba2f8
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x209
+ RenderBlock {HTML} at (0,0) size 800x209
+ RenderBody {BODY} at (8,16) size 784x185
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 135x150
+ RenderTableSection {TBODY} at (0,0) size 135x150
+ RenderTableRow {TR} at (0,0) size 135x50
+ RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,50) size 135x50
+ RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableRow {TR} at (0,100) size 135x50
+ RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
+ RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 43x19
+ text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.checksum
new file mode 100644
index 0000000..dd01319
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.checksum
@@ -0,0 +1 @@
+0a378dd68172aaa890c73b3d5d72fa5e
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.png
new file mode 100644
index 0000000..44f3cf4
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.txt
new file mode 100644
index 0000000..7866bc9
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 155x170 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 150x165
+ RenderTableRow {TR} at (0,0) size 150x55
+ RenderTableCell {TD} at (0,14) size 50x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (50,14) size 50x26 [border: (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (100,14) size 50x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableRow {TR} at (0,55) size 150x55
+ RenderTableCell {TD} at (0,69) size 50x26 [border: (3px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (50,69) size 50x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 31x19
+ text run at (4,4) width 31: "none"
+ RenderTableCell {TD} at (100,69) size 50x26 [border: (3px double #00FF00)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableRow {TR} at (0,110) size 150x55
+ RenderTableCell {TD} at (0,124) size 50x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (50,124) size 50x26 [border: (3px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
+ RenderTableCell {TD} at (100,124) size 50x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 43x19
+ text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.checksum
new file mode 100644
index 0000000..ad8796f
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.checksum
@@ -0,0 +1 @@
+0c660e3e9989fe5253c85be66e13c37c
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.png
new file mode 100644
index 0000000..28ff281
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.txt
new file mode 100644
index 0000000..785dfb6
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 117x170 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 112x165
+ RenderTableRow {TR} at (0,0) size 112x55
+ RenderTableCell {TD} at (0,14) size 37x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (37,14) size 38x26 [border: (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (75,14) size 37x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableRow {TR} at (0,55) size 112x55
+ RenderTableCell {TD} at (0,69) size 37x26 [border: (3px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (37,69) size 38x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 31x19
+ text run at (4,4) width 31: "none"
+ RenderTableCell {TD} at (75,69) size 37x26 [border: (3px solid #00FF00)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableRow {TR} at (0,110) size 112x55
+ RenderTableCell {TD} at (0,124) size 37x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (37,124) size 38x26 [border: (3px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
+ RenderTableCell {TD} at (75,124) size 37x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.checksum
new file mode 100644
index 0000000..1e0c7a5
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.checksum
@@ -0,0 +1 @@
+15aa78f8ab7a8aab2f1981b8e92c4d52
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.png
new file mode 100644
index 0000000..96bd87c
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.txt
new file mode 100644
index 0000000..0299995
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 158x170 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 153x165
+ RenderTableRow {TR} at (0,0) size 153x55
+ RenderTableCell {TD} at (0,14) size 51x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (51,14) size 51x26 [border: (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (102,14) size 51x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,55) size 153x55
+ RenderTableCell {TD} at (0,69) size 51x26 [border: (3px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (51,69) size 51x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 31x19
+ text run at (4,4) width 31: "none"
+ RenderTableCell {TD} at (102,69) size 51x26 [border: (3px dashed #00FF00)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableRow {TR} at (0,110) size 153x55
+ RenderTableCell {TD} at (0,124) size 51x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (51,124) size 51x26 [border: (3px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
+ RenderTableCell {TD} at (102,124) size 51x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.checksum
new file mode 100644
index 0000000..cc061ed
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.checksum
@@ -0,0 +1 @@
+27d6975e45625287ceb1fe53b513fe3d
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.png
new file mode 100644
index 0000000..f219f05
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.txt
new file mode 100644
index 0000000..770a619
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 143x170 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 138x165
+ RenderTableRow {TR} at (0,0) size 138x55
+ RenderTableCell {TD} at (0,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (46,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (92,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,55) size 138x55
+ RenderTableCell {TD} at (0,69) size 46x26 [border: (3px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (46,69) size 46x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 31x19
+ text run at (4,4) width 31: "none"
+ RenderTableCell {TD} at (92,69) size 46x26 [border: (3px dotted #00FF00)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableRow {TR} at (0,110) size 138x55
+ RenderTableCell {TD} at (0,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (46,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
+ RenderTableCell {TD} at (92,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 39x19
+ text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.checksum
new file mode 100644
index 0000000..e820577
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.checksum
@@ -0,0 +1 @@
+964a300fcd8ab6540082f49d41271d33
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.png
new file mode 100644
index 0000000..90738a6
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.txt
new file mode 100644
index 0000000..2715cbf
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 122x170 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 117x165
+ RenderTableRow {TR} at (0,0) size 117x55
+ RenderTableCell {TD} at (0,14) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (39,14) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (78,14) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,55) size 117x55
+ RenderTableCell {TD} at (0,69) size 39x26 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (39,69) size 39x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 31x19
+ text run at (4,4) width 31: "none"
+ RenderTableCell {TD} at (78,69) size 39x26 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableRow {TR} at (0,110) size 117x55
+ RenderTableCell {TD} at (0,124) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (39,124) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
+ RenderTableCell {TD} at (78,124) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 32x19
+ text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.checksum
new file mode 100644
index 0000000..b04aa24
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.checksum
@@ -0,0 +1 @@
+3ac1c5b7f54434a7be2e4569ce614e74
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.png
new file mode 100644
index 0000000..7637d1b
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.txt
new file mode 100644
index 0000000..d652238
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 137x170 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 132x165
+ RenderTableRow {TR} at (0,0) size 132x55
+ RenderTableCell {TD} at (0,14) size 44x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (44,14) size 44x26 [border: (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (88,14) size 44x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableRow {TR} at (0,55) size 132x55
+ RenderTableCell {TD} at (0,69) size 44x26 [border: (3px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (44,69) size 44x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 31x19
+ text run at (4,4) width 31: "none"
+ RenderTableCell {TD} at (88,69) size 44x26 [border: (3px outset #00FF00)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableRow {TR} at (0,110) size 132x55
+ RenderTableCell {TD} at (0,124) size 44x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (44,124) size 44x26 [border: (3px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
+ RenderTableCell {TD} at (88,124) size 44x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 37x19
+ text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.checksum
new file mode 100644
index 0000000..3b673d9
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.checksum
@@ -0,0 +1 @@
+b115402cddd028080ef69fd1025124a9
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.png
new file mode 100644
index 0000000..5bb57e9
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.txt
new file mode 100644
index 0000000..e549b2c
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 158x170 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 153x165
+ RenderTableRow {TR} at (0,0) size 153x55
+ RenderTableCell {TD} at (0,14) size 51x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (51,14) size 51x26 [border: (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (102,14) size 51x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableRow {TR} at (0,55) size 153x55
+ RenderTableCell {TD} at (0,69) size 51x26 [border: (3px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (51,69) size 51x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 31x19
+ text run at (4,4) width 31: "none"
+ RenderTableCell {TD} at (102,69) size 51x26 [border: (3px groove #00FF00)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableRow {TR} at (0,110) size 153x55
+ RenderTableCell {TD} at (0,124) size 51x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (51,124) size 51x26 [border: (3px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
+ RenderTableCell {TD} at (102,124) size 51x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 44x19
+ text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.checksum
new file mode 100644
index 0000000..f406801
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.checksum
@@ -0,0 +1 @@
+410b82b2e550b2d350394db58c0dcee7
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.png
new file mode 100644
index 0000000..2dcc54e
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.txt
new file mode 100644
index 0000000..136f29c
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x229
+ RenderBlock {HTML} at (0,0) size 800x229
+ RenderBody {BODY} at (8,16) size 784x205
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 115x170 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 110x165
+ RenderTableRow {TR} at (0,0) size 110x55
+ RenderTableCell {TD} at (0,14) size 36x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (36,14) size 38x26 [border: (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (74,14) size 36x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableRow {TR} at (0,55) size 110x55
+ RenderTableCell {TD} at (0,69) size 36x26 [border: (3px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (36,69) size 38x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 31x19
+ text run at (4,4) width 31: "none"
+ RenderTableCell {TD} at (74,69) size 36x26 [border: (3px inset #00FF00)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableRow {TR} at (0,110) size 110x55
+ RenderTableCell {TD} at (0,124) size 36x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (36,124) size 38x26 [border: (3px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
+ RenderTableCell {TD} at (74,124) size 36x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 29x19
+ text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.checksum b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.checksum
new file mode 100644
index 0000000..3b3a9ff
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.checksum
@@ -0,0 +1 @@
+f1110c8f2bbdce6e7efe0e9dcda227fd
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.png
new file mode 100644
index 0000000..25f1d68
Binary files /dev/null and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.png differ
diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.txt
new file mode 100644
index 0000000..0d2c50b
--- /dev/null
+++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.txt
@@ -0,0 +1,40 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x209
+ RenderBlock {HTML} at (0,0) size 800x209
+ RenderBody {BODY} at (8,16) size 784x185
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 317x19
+ text run at (0,0) width 317: "There should be no red borders on the table below"
+ RenderTable {TABLE} at (0,35) size 99x150
+ RenderTableSection {TBODY} at (0,0) size 99x150
+ RenderTableRow {TR} at (0,0) size 99x50
+ RenderTableCell {TD} at (0,14) size 33x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (33,14) size 33x21 [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (66,14) size 33x21 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableRow {TR} at (0,50) size 99x50
+ RenderTableCell {TD} at (0,64) size 33x21 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (33,64) size 33x21 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (66,64) size 33x21 [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableRow {TR} at (0,100) size 99x50
+ RenderTableCell {TD} at (0,114) size 33x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (33,114) size 33x21 [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
+ RenderTableCell {TD} at (66,114) size 33x21 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 31x19
+ text run at (1,1) width 31: "none"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list