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

third_party/WebKit/Source/core/style/CachedUAStyle.h

Index: third_party/WebKit/Source/core/style/CachedUAStyle.h
diff --git a/third_party/WebKit/Source/core/style/CachedUAStyle.h b/third_party/WebKit/Source/core/style/CachedUAStyle.h
index 1f8c095009d76c16c33091637b6d60ed53dbdc9e..511f2f0c0b810ec89cae51fc3c74e0e081a2829a 100644
--- a/third_party/WebKit/Source/core/style/CachedUAStyle.h
+++ b/third_party/WebKit/Source/core/style/CachedUAStyle.h
@@ -25,6 +25,7 @@
 
 #include <memory>
 #include "core/style/ComputedStyle.h"
+#include "platform/graphics/Color.h"
 #include "platform/wtf/Allocator.h"
 #include "platform/wtf/Noncopyable.h"
 #include "platform/wtf/PtrUtil.h"
@@ -49,6 +50,14 @@ class CachedUAStyle {
   LengthSize top_right_;
   LengthSize bottom_left_;
   LengthSize bottom_right_;
+  Color border_left_color;

[shend, 2017/05/09 07:24:41]

Probably won't make a difference, but we can rearrange these in order of
alignment size: LengthSize, float, Color, unsigned bitfields.

[nainar, 2017/05/09 07:40:39]

Will do this in a separate patch

+  Color border_right_color;
+  Color border_top_color;
+  Color border_bottom_color;
+  unsigned border_left_color_is_current_color : 1;
+  unsigned border_right_color_is_current_color : 1;
+  unsigned border_top_color_is_current_color : 1;
+  unsigned border_bottom_color_is_current_color : 1;
   float border_left_width;
   float border_right_width;
   float border_top_width;
@@ -63,6 +72,22 @@ class CachedUAStyle {
         top_right_(style->BorderTopRightRadius()),
         bottom_left_(style->BorderBottomLeftRadius()),
         bottom_right_(style->BorderBottomRightRadius()),
+        border_left_color(
+            style->VisitedDependentColor(CSSPropertyBorderLeftColor)),
+        border_right_color(
+            style->VisitedDependentColor(CSSPropertyBorderRightColor)),
+        border_top_color(
+            style->VisitedDependentColor(CSSPropertyBorderTopColor)),
+        border_bottom_color(
+            style->VisitedDependentColor(CSSPropertyBorderBottomColor)),
+        border_left_color_is_current_color(
+            style->BorderLeftColorIsCurrentColor()),
+        border_right_color_is_current_color(
+            style->BorderRightColorIsCurrentColor()),
+        border_top_color_is_current_color(
+            style->BorderTopColorIsCurrentColor()),
+        border_bottom_color_is_current_color(
+            style->BorderBottomColorIsCurrentColor()),
         border_left_width(style->BorderLeftWidth()),
         border_right_width(style->BorderRightWidth()),
         border_top_width(style->BorderTopWidth()),