Store border-*-color on SurroundData in ComputedStyle not BorderColorAndStyle

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

 {
 // This file specifies fields in ComputedStyle that we would like to
 // generate, but are not CSS properties.
 
   parameters: {
     // If the field has_custom_compare_and_copy, then it does not appear in
     // ComputedStyle::operator== and ComputedStyle::CopyNonInheritedFromCached.
     has_custom_compare_and_copy: {
       default: false,
     },
 
     // The rest is the same as CSSProperties.json5, but the only relevant ones in
     // this file are:
     // name, field_template, field_type_path, default_value, type_name, keyword,
     // inherited
   },
 
   data: [
     {
       name: "IsLink",
       field_template: "monotonic_flag",
       default_value: "false",
       has_custom_compare_and_copy: true,
     },
     {
+      name: "BorderLeftColorIsCurrentColor",
+      field_template: "primitive",
+      default_value: "true",
+      type_name: "bool",
+      field_group: "surround",
+    },
+    {
+      name: "BorderRightColorIsCurrentColor",
+      field_template: "primitive",
+      default_value: "true",
+      type_name: "bool",
+      field_group: "surround",
+    },
+    {
+      name: "BorderTopColorIsCurrentColor",
+      field_template: "primitive",
+      default_value: "true",
+      type_name: "bool",
+      field_group: "surround",
+    },
+    {
+      name: "BorderBottomColorIsCurrentColor",
+      field_template: "primitive",
+      default_value: "true",
+      type_name: "bool",
+      field_group: "surround",
+    },
+    {
       name: "OriginalDisplay",
       field_template: "keyword",
       default_value: "inline",
       type_name: "EDisplay",
       keywords: [
           "inline", "block", "list-item", "inline-block", "table", "inline-table", "table-row-group", "table-header-group",
           "table-footer-group", "table-row", "table-column-group", "table-column", "table-cell", "table-caption", "-webkit-box",
           "-webkit-inline-box", "flex", "inline-flex", "grid", "inline-grid", "contents", "flow-root", "none",
       ],
     },
@@ skipping 150 matching lines @@
     {
       name: "HasAutoClip",
       field_template: "storage_only",
       type_name: "bool",
       field_size: 1,
       default_value: "true",
       field_group: "visual",
     },
   ],
 }