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

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

Index: third_party/WebKit/Source/core/style/BorderValue.h
diff --git a/third_party/WebKit/Source/core/style/BorderValue.h b/third_party/WebKit/Source/core/style/BorderValue.h
index 0c71ba0f4820070fbb9b8a98faf0af6dcd0915b3..f1bec568c4bad32040cbeae612cad5c7284ea794 100644
--- a/third_party/WebKit/Source/core/style/BorderValue.h
+++ b/third_party/WebKit/Source/core/style/BorderValue.h
@@ -26,7 +26,7 @@
 #define BorderValue_h
 
 #include "core/css/StyleColor.h"
-#include "core/style/BorderColorAndStyle.h"
+#include "core/style/BorderStyle.h"
 #include "core/style/ComputedStyleConstants.h"
 #include "platform/graphics/Color.h"
 #include "platform/wtf/Allocator.h"
@@ -46,9 +46,9 @@ class BorderValue {
     SetWidth(3);
   }
 
-  BorderValue(const BorderColorAndStyle& data, float width) {
-    SetColor(data.GetColor());
-    SetColorIsCurrentColor(ColorIsCurrentColor());
+  BorderValue(const BorderStyle& data, const StyleColor& color, float width) {
+    SetColor(color.Resolve(Color()));
+    SetColorIsCurrentColor(color.IsCurrentColor());
     SetStyle(data.Style());
     SetIsAuto(data.IsAuto());
     SetWidth(width);