Move white-space 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 194 matching lines @@
     bool operator!=(const InheritedData& other) const {
       return !(*this == other);
     }
 
     inline bool compareEqualIndependent(const InheritedData& other) const {
       // These must match the properties tagged 'independent' in
       // CSSProperties.in.
       // TODO(napper): Remove this once all independent properties are
       // generated and replace with a private function used only in
       // stylePropagationDiff().
-      return (m_pointerEvents == other.m_pointerEvents) &&
-             (m_whiteSpace == other.m_whiteSpace);
+      return (m_pointerEvents == other.m_pointerEvents);
     }
 
     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_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_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 91 matching lines @@
     // TODO(sashab): Move these flags closer to inheritedData so that it's
     // clear which inherited properties have a flag stored and which don't.
     // Keep this list of fields in sync with:
     // - setBitDefaults()
     // - The ComputedStyle setter, which must take an extra boolean parameter
     //   and set this - propagateIndependentInheritedProperties() in
     //   ComputedStyle.cpp
     // - The compareEqual() methods in the corresponding class
     // InheritedFlags
     unsigned m_isPointerEventsInherited : 1;
-    unsigned m_isWhiteSpaceInherited : 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_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_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 20 matching lines @@
     m_nonInheritedData.m_hasViewportUnits = false;
     m_nonInheritedData.m_affectedByFocus = false;
     m_nonInheritedData.m_affectedByHover = false;
     m_nonInheritedData.m_affectedByActive = false;
     m_nonInheritedData.m_affectedByDrag = false;
     m_nonInheritedData.m_isLink = false;
     m_nonInheritedData.m_hasRemUnits = false;
 
     // All independently inherited properties default to being inherited.
     m_nonInheritedData.m_isPointerEventsInherited = true;
-    m_nonInheritedData.m_isWhiteSpaceInherited = true;
   }
 
  private:
   // TODO(sashab): Move these to the bottom of ComputedStyle.
   ALWAYS_INLINE ComputedStyle();
 
   enum InitialStyleTag { InitialStyle };
   ALWAYS_INLINE explicit ComputedStyle(InitialStyleTag);
   ALWAYS_INLINE ComputedStyle(const ComputedStyle&);
 
@@ skipping 1841 matching lines @@
   static TextSizeAdjust initialTextSizeAdjust() {
     return TextSizeAdjust::adjustAuto();
   }
   TextSizeAdjust getTextSizeAdjust() const {
     return m_rareInheritedData->m_textSizeAdjust;
   }
   void setTextSizeAdjust(TextSizeAdjust sizeAdjust) {
     SET_VAR(m_rareInheritedData, m_textSizeAdjust, sizeAdjust);
   }
 
-  // white-space inherited
-  static EWhiteSpace initialWhiteSpace() { return EWhiteSpace::Normal; }
-  EWhiteSpace whiteSpace() const {
-    return static_cast<EWhiteSpace>(m_inheritedData.m_whiteSpace);
-  }
-  void setWhiteSpace(EWhiteSpace v) {
-    m_inheritedData.m_whiteSpace = static_cast<unsigned>(v);
-  }
-  void setWhiteSpaceIsInherited(bool isInherited) {
-    m_nonInheritedData.m_isWhiteSpaceInherited = isInherited;
-  }
-
   // word-break inherited (aka -epub-word-break)
   static EWordBreak initialWordBreak() { return NormalWordBreak; }
   EWordBreak wordBreak() const {
     return static_cast<EWordBreak>(m_rareInheritedData->wordBreak);
   }
   void setWordBreak(EWordBreak b) {
     SET_VAR(m_rareInheritedData, wordBreak, b);
   }
 
   // -webkit-line-break
@@ skipping 1802 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