Made CSS white-space property use IndependentInherit

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 192 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(sashab): Generate this function.
-      return (m_pointerEvents == other.m_pointerEvents);
+      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_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_textAlign : 4;          // ETextAlign
@@ skipping 108 matching lines @@
     // 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_isVisibilityInherited : 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 =
@@ skipping 38 matching lines @@
     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_isVisibilityInherited = 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 1857 matching lines @@
   }
 
   // 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);
   }
 
@@ skipping 1800 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