Changed EBorderCollapse to an enum class and renamed its members

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

Index: third_party/WebKit/Source/core/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index 86b3373510b5d0f244d7bb883042a4286d6c7c8f..2ee781a0144d73908be32b0099d7b765d2edeae9 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -368,7 +368,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
     m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
     m_inheritedData.m_direction = initialDirection();
     m_inheritedData.m_whiteSpace = static_cast<unsigned>(initialWhiteSpace());
-    m_inheritedData.m_borderCollapse = initialBorderCollapse();
+    m_inheritedData.m_borderCollapse =
+        static_cast<unsigned>(initialBorderCollapse());
     m_inheritedData.m_rtlOrdering = initialRTLOrdering();
     m_inheritedData.m_boxDirection =
         static_cast<unsigned>(initialBoxDirection());
@@ -2054,13 +2055,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
 
   // border-collapse
   static EBorderCollapse initialBorderCollapse() {
-    return BorderCollapseSeparate;
+    return EBorderCollapse::Separate;
   }
   EBorderCollapse borderCollapse() const {
     return static_cast<EBorderCollapse>(m_inheritedData.m_borderCollapse);
   }
   void setBorderCollapse(EBorderCollapse collapse) {
-    m_inheritedData.m_borderCollapse = collapse;
+    m_inheritedData.m_borderCollapse = static_cast<unsigned>(collapse);
   }
 
   // Border-spacing properties.