Moved list-style-type 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 180 matching lines @@
   std::unique_ptr<PseudoStyleCache> m_cachedPseudoStyles;
 
   DataRef<SVGComputedStyle> m_svgStyle;
 
   // !START SYNC!: Keep this in sync with the copy constructor in
   // ComputedStyle.cpp and implicitlyInherited() in StyleResolver.cpp
 
   // inherit
   struct InheritedData {
     bool operator==(const InheritedData& other) const {
-      return (m_listStyleType == other.m_listStyleType) &&
-             (m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
+      return (m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
              (m_cursorStyle == other.m_cursorStyle) &&
              (m_direction == other.m_direction) &&
              (m_rtlOrdering == other.m_rtlOrdering) &&
              (m_insideLink == other.m_insideLink) &&
              (m_writingMode == other.m_writingMode);
     }
 
     bool operator!=(const InheritedData& other) const {
       return !(*this == other);
     }
 
-    unsigned m_listStyleType : 7;      // EListStyleType
     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
     // 32 bits
 
     // non CSS2 inherited
     unsigned m_rtlOrdering : 1;       // EOrder
     unsigned m_insideLink : 2;     // EInsideLink
 
@@ skipping 81 matching lines @@
     mutable unsigned m_hasRemUnits : 1;
 
     // If you add more style bits here, you will also need to update
     // ComputedStyle::copyNonInheritedFromCached() 68 bits
   } m_nonInheritedData;
 
   // !END SYNC!
 
   void setBitDefaults() {
     ComputedStyleBase::setBitDefaults();
-    m_inheritedData.m_listStyleType =
-        static_cast<unsigned>(initialListStyleType());
     m_inheritedData.m_hasSimpleUnderline = false;
     m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
     m_inheritedData.m_direction = static_cast<unsigned>(initialDirection());
     m_inheritedData.m_rtlOrdering = static_cast<unsigned>(initialRTLOrdering());
     m_inheritedData.m_insideLink = NotInsideLink;
     m_inheritedData.m_writingMode = initialWritingMode();
 
     m_nonInheritedData.m_effectiveDisplay =
         m_nonInheritedData.m_originalDisplay =
             static_cast<unsigned>(initialDisplay());
@@ skipping 1725 matching lines @@
   void setHyphenationString(const AtomicString& h) {
     SET_VAR(m_rareInheritedData, hyphenationString, h);
   }
 
   // line-height
   static Length initialLineHeight() { return Length(-100.0, Percent); }
   Length lineHeight() const;
   void setLineHeight(const Length& specifiedLineHeight);
 
   // List style properties.
-  // list-style-type
-  static EListStyleType initialListStyleType() { return EListStyleType::Disc; }
-  EListStyleType listStyleType() const {
-    return static_cast<EListStyleType>(m_inheritedData.m_listStyleType);
-  }
-  void setListStyleType(EListStyleType v) {
-    m_inheritedData.m_listStyleType = static_cast<unsigned>(v);
-  }
-
   // list-style-image
   static StyleImage* initialListStyleImage() { return 0; }
   StyleImage* listStyleImage() const;
   void setListStyleImage(StyleImage*);
 
   // orphans
   static short initialOrphans() { return 2; }
   short orphans() const { return m_rareInheritedData->orphans; }
   void setOrphans(short o) { SET_VAR(m_rareInheritedData, orphans, o); }
 
@@ skipping 1910 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