Changed EBorderCollapse to an enum class and renamed its members

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 350 matching lines @@
     ComputedStyleBase::setBitDefaults();
     m_inheritedData.m_listStyleType =
         static_cast<unsigned>(initialListStyleType());
     m_inheritedData.m_textAlign = static_cast<unsigned>(initialTextAlign());
     m_inheritedData.m_textTransform =
         static_cast<unsigned>(initialTextTransform());
     m_inheritedData.m_hasSimpleUnderline = false;
     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());
     m_inheritedData.m_printColorAdjust =
         static_cast<unsigned>(initialPrintColorAdjust());
     m_inheritedData.m_pointerEvents = initialPointerEvents();
     m_inheritedData.m_insideLink = NotInsideLink;
     m_inheritedData.m_writingMode = initialWritingMode();
 
     m_nonInheritedData.m_effectiveDisplay =
@@ skipping 1665 matching lines @@
     return m_rareNonInheritedData->m_maskBoxImage.borderSlices();
   }
   void setMaskBoxImageWidth(const BorderImageLengthBox& slices) {
     m_rareNonInheritedData.access()->m_maskBoxImage.setBorderSlices(slices);
   }
 
   // Inherited properties.
 
   // 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.
   // -webkit-border-horizontal-spacing
   static short initialHorizontalBorderSpacing() { return 0; }
   short horizontalBorderSpacing() const;
   void setHorizontalBorderSpacing(short);
 
   // -webkit-border-vertical-spacing
   static short initialVerticalBorderSpacing() { return 0; }
@@ skipping 2019 matching lines @@
   m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h