Store border-*-style on SurroundData in ComputedStyle

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 3002f60217d3b0ca54aadda406ba17e16ebb43af..35b2f8d75083f590cb838bda204c5c09343268bd 100644
--- a/third_party/WebKit/Source/core/style/BorderValue.h
+++ b/third_party/WebKit/Source/core/style/BorderValue.h
@@ -26,7 +26,6 @@
 #define BorderValue_h
 
 #include "core/css/StyleColor.h"
-#include "core/style/BorderStyle.h"
 #include "core/style/ComputedStyleConstants.h"
 #include "platform/graphics/Color.h"
 #include "platform/wtf/Allocator.h"
@@ -46,11 +45,14 @@ class BorderValue {
     SetWidth(3);
   }
 
-  BorderValue(const BorderStyle& data, const StyleColor& color, float width) {
+  BorderValue(EBorderStyle style,
+              const StyleColor& color,
+              float width,
+              OutlineIsAuto is_auto) {
     SetColor(color.Resolve(Color()));
-    SetStyle(data.Style());
-    SetIsAuto(data.IsAuto());
+    SetStyle(style);
     SetWidth(width);
+    SetIsAuto(is_auto);
   }
 
   bool NonZero() const {