Move list-style-position 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 197 matching lines @@
 
     inline bool compareEqualIndependent(const InheritedData& other) const {
       // These must match the properties tagged 'independent' in
       // CSSProperties.in.
       // TODO(sashab): Generate this function.
       return (m_pointerEvents == other.m_pointerEvents);
     }
 
     inline bool compareEqualNonIndependent(const InheritedData& other) const {
       return (m_listStyleType == other.m_listStyleType) &&
-             (m_listStylePosition == other.m_listStylePosition) &&
              (m_textAlign == other.m_textAlign) &&
              (m_textTransform == other.m_textTransform) &&
              (m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
              (m_cursorStyle == other.m_cursorStyle) &&
              (m_direction == other.m_direction) &&
              (m_whiteSpace == other.m_whiteSpace) &&
              (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_listStylePosition : 1;  // EListStylePosition
     unsigned m_textAlign : 4;          // ETextAlign
     unsigned m_textTransform : 2;      // ETextTransform
     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)
@@ skipping 111 matching lines @@
     // 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_listStylePosition =
-        static_cast<unsigned>(initialListStylePosition());
     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_rtlOrdering = initialRTLOrdering();
     m_inheritedData.m_boxDirection =
@@ skipping 1744 matching lines @@
   // 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-position
-  static EListStylePosition initialListStylePosition() {
-    return EListStylePosition::Outside;
-  }
-  EListStylePosition listStylePosition() const {
-    return static_cast<EListStylePosition>(m_inheritedData.m_listStylePosition);
-  }
-  void setListStylePosition(EListStylePosition v) {
-    m_inheritedData.m_listStylePosition = 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 1954 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