Move border-collapse to be generated in ComputedStyleBase

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 202 matching lines @@
       return (m_pointerEvents == other.m_pointerEvents) &&
              (m_whiteSpace == other.m_whiteSpace);
     }
 
     inline bool compareEqualNonIndependent(const InheritedData& other) const {
       return (m_listStyleType == other.m_listStyleType) &&
              (m_textAlign == other.m_textAlign) &&
              (m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
              (m_cursorStyle == other.m_cursorStyle) &&
              (m_direction == other.m_direction) &&
-             (m_borderCollapse == other.m_borderCollapse) &&
              (m_boxDirection == other.m_boxDirection) &&
              (m_rtlOrdering == other.m_rtlOrdering) &&
              (m_printColorAdjust == other.m_printColorAdjust) &&
              (m_insideLink == other.m_insideLink) &&
              (m_writingMode == other.m_writingMode);
     }
 
     unsigned m_listStyleType : 7;      // EListStyleType
     unsigned m_textAlign : 4;          // ETextAlign
     unsigned m_hasSimpleUnderline : 1;  // True if 'underline solid' is the only
                                         // text decoration on this element.
     unsigned m_cursorStyle : 6;     // ECursor
     unsigned m_direction : 1;       // TextDirection
     unsigned m_whiteSpace : 3;      // EWhiteSpace
-    unsigned m_borderCollapse : 1;  // EBorderCollapse
     unsigned m_boxDirection : 1;  // EBoxDirection (CSS3 box_direction property,
                                   // flexible box layout module)
     // 32 bits
 
     // non CSS2 inherited
     unsigned m_rtlOrdering : 1;       // EOrder
     unsigned m_printColorAdjust : 1;  // PrintColorAdjust
     unsigned m_pointerEvents : 4;  // EPointerEvents
     unsigned m_insideLink : 2;     // EInsideLink
 
@@ skipping 109 matching lines @@
 
   void setBitDefaults() {
     ComputedStyleBase::setBitDefaults();
     m_inheritedData.m_listStyleType =
         static_cast<unsigned>(initialListStyleType());
     m_inheritedData.m_textAlign = static_cast<unsigned>(initialTextAlign());
     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 =
-        static_cast<unsigned>(initialBorderCollapse());
     m_inheritedData.m_rtlOrdering = static_cast<unsigned>(initialRTLOrdering());
     m_inheritedData.m_boxDirection =
         static_cast<unsigned>(initialBoxDirection());
     m_inheritedData.m_printColorAdjust =
         static_cast<unsigned>(initialPrintColorAdjust());
     m_inheritedData.m_pointerEvents =
         static_cast<unsigned>(initialPointerEvents());
     m_inheritedData.m_insideLink = NotInsideLink;
     m_inheritedData.m_writingMode = initialWritingMode();
 
@@ skipping 1665 matching lines @@
   // -webkit-mask-box-image-width
   const BorderImageLengthBox& maskBoxImageWidth() const {
     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 EBorderCollapse::Separate;
-  }
-  EBorderCollapse borderCollapse() const {
-    return static_cast<EBorderCollapse>(m_inheritedData.m_borderCollapse);
-  }
-  void setBorderCollapse(EBorderCollapse 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; }
   short verticalBorderSpacing() const;
   void setVerticalBorderSpacing(short);
@@ skipping 2031 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