Store border-*-style on SurroundData in ComputedStyle

third_party/WebKit/Source/core/css/CSSProperties.json5

Index: third_party/WebKit/Source/core/css/CSSProperties.json5
diff --git a/third_party/WebKit/Source/core/css/CSSProperties.json5 b/third_party/WebKit/Source/core/css/CSSProperties.json5
index 94884a3d9bed2656a0eb8b9c5aa7e0db36339b1d..13622d1fbbec34d4601e1301e1b929a45fe46cb3 100644
--- a/third_party/WebKit/Source/core/css/CSSProperties.json5
+++ b/third_party/WebKit/Source/core/css/CSSProperties.json5
@@ -685,10 +685,12 @@
     },
     {
       name: "border-bottom-style",
-      initial: "InitialBorderStyle",
       type_name: "EBorderStyle",
-      keywords: ["none"],
+      field_template: "keyword",
+      keywords: ["none", "hidden", "inset", "groove", "outset", "ridge", "dotted", "dashed", "solid", "double"],
+      default_value: "none",
       typedom_types: ["Image"],
+      field_group: "surround",
     },
     {
       name: "border-bottom-width",
@@ -755,10 +757,12 @@
     },
     {
       name: "border-left-style",
-      initial: "InitialBorderStyle",
       type_name: "EBorderStyle",
-      keywords: ["none"],
+      field_template: "keyword",
+      keywords: ["none", "hidden", "inset", "groove", "outset", "ridge", "dotted", "dashed", "solid", "double"],
+      default_value: "none",
       typedom_types: ["Image"],
+      field_group: "surround",
     },
     {
       name: "border-left-width",
@@ -785,10 +789,12 @@
     },
     {
       name: "border-right-style",
-      initial: "InitialBorderStyle",
       type_name: "EBorderStyle",
-      keywords: ["none"],
       typedom_types: ["Image"],
+      field_template: "keyword",
+      default_value: "none",
+      keywords: ["none", "hidden", "inset", "groove", "outset", "ridge", "dotted", "dashed", "solid", "double"],
+      field_group: "surround",
     },
     {
       name: "border-right-width",
@@ -837,10 +843,12 @@
     },
     {
       name: "border-top-style",
-      initial: "InitialBorderStyle",
       type_name: "EBorderStyle",
-      keywords: ["none"],
+      field_template: "keyword",
+      default_value: "none",
+      keywords: ["none", "hidden", "inset", "groove", "outset", "ridge", "dotted", "dashed", "solid", "double"],
       typedom_types: ["Image"],
+      field_group: "surround",
     },
     {
       name: "border-top-width",
@@ -2247,7 +2255,7 @@
     },
     {
       name: "column-rule-style",
-      initial: "InitialBorderStyle",
+      initial: "InitialColumnRuleStyle",
       type_name: "EBorderStyle",
     },
     {