Remove dependency on order of enum EBorderStyle

third_party/WebKit/Source/core/layout/CollapsedBorderValue.h

Index: third_party/WebKit/Source/core/layout/CollapsedBorderValue.h
diff --git a/third_party/WebKit/Source/core/layout/CollapsedBorderValue.h b/third_party/WebKit/Source/core/layout/CollapsedBorderValue.h
index 4cd2318cfb435519957afc02737e3942887f6e78..74c55752ee67dddc67587f1710082d3fe147ef3f 100644
--- a/third_party/WebKit/Source/core/layout/CollapsedBorderValue.h
+++ b/third_party/WebKit/Source/core/layout/CollapsedBorderValue.h
@@ -25,7 +25,7 @@
 #ifndef CollapsedBorderValue_h
 #define CollapsedBorderValue_h
 
-#include "core/style/BorderValue.h"
+#include "core/style/ComputedStyle.h"
 #include "platform/wtf/Allocator.h"
 
 namespace blink {
@@ -55,7 +55,9 @@ class CollapsedBorderValue {
                        const Color& color,
                        EBorderPrecedence precedence)
       : color_(color),
-        width_(border.Style() > EBorderStyle::kHidden ? border.Width() : 0),
+        width_(ComputedStyle::BorderStyleIsVisible(border.Style())
+                   ? border.Width()
+                   : 0),
         style_(static_cast<unsigned>(border.Style())),
         precedence_(precedence) {
     DCHECK(precedence != kBorderPrecedenceOff);