Auto-rebaseline for r182920

LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-97-d-expected.txt

Index: LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-97-d-expected.txt
diff --git a/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-03-d-expected.txt b/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-97-d-expected.txt
similarity index 52%
copy from LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-03-d-expected.txt
copy to LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-97-d-expected.txt
index f59f682571ee8b5cf46ba714917e9a7d0d1293e0..058baa5ed14e41ec4cbe5323fee769b05c608676 100644
--- a/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-03-d-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-97-d-expected.txt
@@ -9,32 +9,32 @@ layer at (0,0) size 800x226
       RenderTable {TABLE} at (0,32) size 161x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 156x165
           RenderTableRow {TR} at (0,0) size 156x55
-            RenderTableCell {TD} at (0,16) size 52x23 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 52x23 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 45x16
-                text run at (4,4) width 45: "dashed"
-            RenderTableCell {TD} at (52,17) size 52x21 [border: (3px dashed #00FF00) none (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+                text run at (4,4) width 45: "groove"
+            RenderTableCell {TD} at (52,16) size 52x23 [border: (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 45x16
-                text run at (4,4) width 45: "dashed"
-            RenderTableCell {TD} at (104,16) size 52x23 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+                text run at (4,4) width 45: "groove"
+            RenderTableCell {TD} at (104,16) size 52x23 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 45x16
-                text run at (4,4) width 45: "dashed"
+                text run at (4,4) width 45: "groove"
           RenderTableRow {TR} at (0,55) size 156x55
-            RenderTableCell {TD} at (0,71) size 52x23 [border: (3px dashed #00FF00) none (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 45x16
-                text run at (4,4) width 45: "dashed"
-            RenderTableCell {TD} at (52,73) size 52x18 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 44x16
-                text run at (1,1) width 44: "hidden"
-            RenderTableCell {TD} at (104,71) size 52x23 [border: (3px dashed #00FF00) none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,4) size 45x16
-                text run at (1,4) width 45: "dashed"
+            RenderTableCell {TD} at (0,71) size 52x23 [border: (3px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 45x16
+                text run at (4,4) width 45: "groove"
+            RenderTableCell {TD} at (52,71) size 52x23 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 32x16
+                text run at (4,4) width 32: "none"
+            RenderTableCell {TD} at (104,71) size 52x23 [border: (3px groove #00FF00)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 45x16
+                text run at (4,4) width 45: "groove"
           RenderTableRow {TR} at (0,110) size 156x55
-            RenderTableCell {TD} at (0,126) size 52x23 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,126) size 52x23 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 45x16
+                text run at (4,4) width 45: "groove"
+            RenderTableCell {TD} at (52,126) size 52x23 [border: (3px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 45x16
-                text run at (4,4) width 45: "dashed"
-            RenderTableCell {TD} at (52,127) size 52x20 [border: none (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,1) size 45x16
-                text run at (4,1) width 45: "dashed"
-            RenderTableCell {TD} at (104,126) size 52x23 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+                text run at (4,4) width 45: "groove"
+            RenderTableCell {TD} at (104,126) size 52x23 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 45x16
-                text run at (4,4) width 45: "dashed"
+                text run at (4,4) width 45: "groove"