Move white-space to be generated in ComputedStyleBase.

third_party/WebKit/Source/core/style/ComputedStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 59 matching lines @@
 
 // Since different compilers/architectures pack ComputedStyle differently,
 // re-create the same structure for an accurate size comparison.
 struct SameSizeAsComputedStyle : public ComputedStyleBase,
                                  public RefCounted<ComputedStyle> {
   void* dataRefs[7];
   void* ownPtrs[1];
   void* dataRefSvgStyle;
 
   struct InheritedData {
-    unsigned m_bitfields[2];
+    unsigned m_bitfields[1];
   } m_inheritedData;
 
   struct NonInheritedData {
     unsigned m_bitfields[3];
   } m_nonInheritedData;
 };
 
 ASSERT_SIZE(ComputedStyle, SameSizeAsComputedStyle);
 
 PassRefPtr<ComputedStyle> ComputedStyle::create() {
@@ skipping 139 matching lines @@
     return Inherit;
 
   return NoInherit;
 }
 
 void ComputedStyle::propagateIndependentInheritedProperties(
     const ComputedStyle& parentStyle) {
   ComputedStyleBase::propagateIndependentInheritedProperties(parentStyle);
   if (m_nonInheritedData.m_isPointerEventsInherited)
     setPointerEvents(parentStyle.pointerEvents());
-  if (m_nonInheritedData.m_isWhiteSpaceInherited)
-    setWhiteSpace(parentStyle.whiteSpace());
 }
 
 StyleSelfAlignmentData resolvedSelfAlignment(
     const StyleSelfAlignmentData& value,
     ItemPosition normalValueBehavior) {
   // To avoid needing to copy the RareNonInheritedData, we repurpose the 'auto'
   // flag to not just mean 'auto' prior to running the StyleAdjuster but also
   // mean 'normal' after running it.
   if (value.position() == ItemPositionNormal ||
       value.position() == ItemPositionAuto)
@@ skipping 165 matching lines @@
   // m_nonInheritedData.m_affectedByFocus
   // m_nonInheritedData.m_affectedByHover
   // m_nonInheritedData.m_affectedByActive
   // m_nonInheritedData.m_affectedByDrag
   // m_nonInheritedData.m_isLink
 
   // Any properties that are inherited on a style are also inherited on elements
   // that share this style.
   m_nonInheritedData.m_isPointerEventsInherited =
       other.m_nonInheritedData.m_isPointerEventsInherited;
-  m_nonInheritedData.m_isWhiteSpaceInherited =
-      other.m_nonInheritedData.m_isWhiteSpaceInherited;
 
   if (m_svgStyle != other.m_svgStyle)
     m_svgStyle.access()->copyNonInheritedFromCached(other.m_svgStyle.get());
   DCHECK_EQ(zoom(), initialZoom());
 }
 
 bool ComputedStyle::operator==(const ComputedStyle& o) const {
   return inheritedEqual(o) && nonInheritedEqual(o);
 }
 
@@ skipping 377 matching lines @@
         m_styleInheritedData->vertical_border_spacing !=
             other.m_styleInheritedData->vertical_border_spacing)
       return true;
   }
 
   if (m_inheritedData.m_boxDirection != other.m_inheritedData.m_boxDirection ||
       m_inheritedData.m_rtlOrdering != other.m_inheritedData.m_rtlOrdering ||
       m_inheritedData.m_textAlign != other.m_inheritedData.m_textAlign ||
       textTransform() != other.textTransform() ||
       m_inheritedData.m_direction != other.m_inheritedData.m_direction ||
-      m_inheritedData.m_whiteSpace != other.m_inheritedData.m_whiteSpace ||
+      whiteSpace() != other.whiteSpace() ||
       m_inheritedData.m_writingMode != other.m_inheritedData.m_writingMode)
     return true;
 
   if (m_nonInheritedData.m_overflowX != other.m_nonInheritedData.m_overflowX ||
       m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY ||
       m_nonInheritedData.m_clear != other.m_nonInheritedData.m_clear ||
       m_nonInheritedData.m_unicodeBidi !=
           other.m_nonInheritedData.m_unicodeBidi ||
       floating() != other.floating() ||
       m_nonInheritedData.m_originalDisplay !=
@@ skipping 1629 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 }  // namespace blink