Clean up more naming in ComputedStyle

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
  * License as published by the Free Software Foundation; either
@@ skipping 125 matching lines @@
     // FIXME: When we stop resolving currentColor at style time, these can be removed.
     friend class CSSToStyleMap;
     friend class FilterOperationResolver;
     friend class StyleBuilderConverter;
     friend class StyleResolverState;
     friend class StyleResolver;
 protected:
 
     // non-inherited attributes
     DataRef<StyleBoxData> m_box;
-    DataRef<StyleVisualData> visual;
+    DataRef<StyleVisualData> m_visual;
     DataRef<StyleBackgroundData> m_background;
-    DataRef<StyleSurroundData> surround;
-    DataRef<StyleRareNonInheritedData> rareNonInheritedData;
+    DataRef<StyleSurroundData> m_surround;
+    DataRef<StyleRareNonInheritedData> m_rareNonInheritedData;
 
     // inherited attributes
-    DataRef<StyleRareInheritedData> rareInheritedData;
-    DataRef<StyleInheritedData> inherited;
+    DataRef<StyleRareInheritedData> m_rareInheritedData;
+    DataRef<StyleInheritedData> m_styleInheritedData;
 
     // list of associated pseudo styles
     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 {
@@ skipping 38 matching lines @@
 
         // non CSS2 inherited
         unsigned m_rtlOrdering : 1; // Order
         unsigned m_printColorAdjust : PrintColorAdjustBits;
         unsigned m_pointerEvents : 4; // EPointerEvents
         unsigned m_insideLink : 2; // EInsideLink
 
         // CSS Text Layout Module Level 3: Vertical writing support
         unsigned m_writingMode : 2; // WritingMode
         // 42 bits
-    } inherited_data;
+    } m_inheritedData;
 
 // don't inherit
     struct NonInheritedData {
         // Compare computed styles, differences in other flags should not cause an inequality.
         bool operator==(const NonInheritedData& other) const
         {
             return m_effectiveDisplay == other.m_effectiveDisplay
                 && m_originalDisplay == other.m_originalDisplay
                 && m_overflowX == other.m_overflowX
                 && m_overflowY == other.m_overflowY
@@ skipping 55 matching lines @@
         unsigned m_affectedByActive : 1;
         unsigned m_affectedByDrag : 1;
 
         // 64 bits
 
         unsigned m_isLink : 1;
 
         mutable unsigned m_hasRemUnits : 1;
         // If you add more style bits here, you will also need to update ComputedStyle::copyNonInheritedFromCached()
         // 66 bits
-    } noninherited_data;
+    } m_nonInheritedData;
 
 // !END SYNC!
 
 protected:
     void setBitDefaults()
     {
-        inherited_data.m_emptyCells = initialEmptyCells();
-        inherited_data.m_captionSide = initialCaptionSide();
-        inherited_data.m_listStyleType = initialListStyleType();
-        inherited_data.m_listStylePosition = initialListStylePosition();
-        inherited_data.m_visibility = initialVisibility();
-        inherited_data.m_textAlign = initialTextAlign();
-        inherited_data.m_textTransform = initialTextTransform();
-        inherited_data.m_textUnderline = false;
-        inherited_data.m_cursorStyle = initialCursor();
-        inherited_data.m_direction = initialDirection();
-        inherited_data.m_whiteSpace = initialWhiteSpace();
-        inherited_data.m_borderCollapse = initialBorderCollapse();
-        inherited_data.m_rtlOrdering = initialRTLOrdering();
-        inherited_data.m_boxDirection = initialBoxDirection();
-        inherited_data.m_printColorAdjust = initialPrintColorAdjust();
-        inherited_data.m_pointerEvents = initialPointerEvents();
-        inherited_data.m_insideLink = NotInsideLink;
-        inherited_data.m_writingMode = initialWritingMode();
+        m_inheritedData.m_emptyCells = initialEmptyCells();
+        m_inheritedData.m_captionSide = initialCaptionSide();
+        m_inheritedData.m_listStyleType = initialListStyleType();
+        m_inheritedData.m_listStylePosition = initialListStylePosition();
+        m_inheritedData.m_visibility = initialVisibility();
+        m_inheritedData.m_textAlign = initialTextAlign();
+        m_inheritedData.m_textTransform = initialTextTransform();
+        m_inheritedData.m_textUnderline = false;
+        m_inheritedData.m_cursorStyle = initialCursor();
+        m_inheritedData.m_direction = initialDirection();
+        m_inheritedData.m_whiteSpace = initialWhiteSpace();
+        m_inheritedData.m_borderCollapse = initialBorderCollapse();
+        m_inheritedData.m_rtlOrdering = initialRTLOrdering();
+        m_inheritedData.m_boxDirection = initialBoxDirection();
+        m_inheritedData.m_printColorAdjust = initialPrintColorAdjust();
+        m_inheritedData.m_pointerEvents = initialPointerEvents();
+        m_inheritedData.m_insideLink = NotInsideLink;
+        m_inheritedData.m_writingMode = initialWritingMode();
 
-        noninherited_data.m_effectiveDisplay = noninherited_data.m_originalDisplay = initialDisplay();
-        noninherited_data.m_overflowX = initialOverflowX();
-        noninherited_data.m_overflowY = initialOverflowY();
-        noninherited_data.m_verticalAlign = initialVerticalAlign();
-        noninherited_data.m_clear = initialClear();
-        noninherited_data.m_position = initialPosition();
-        noninherited_data.m_floating = initialFloating();
-        noninherited_data.m_tableLayout = initialTableLayout();
-        noninherited_data.m_unicodeBidi = initialUnicodeBidi();
-        noninherited_data.m_breakBefore = initialBreakBefore();
-        noninherited_data.m_breakAfter = initialBreakAfter();
-        noninherited_data.m_breakInside = initialBreakInside();
-        noninherited_data.m_styleType = PseudoIdNone;
-        noninherited_data.m_pseudoBits = 0;
-        noninherited_data.m_explicitInheritance = false;
-        noninherited_data.m_variableReference = false;
-        noninherited_data.m_unique = false;
-        noninherited_data.m_emptyState = false;
-        noninherited_data.m_hasViewportUnits = false;
-        noninherited_data.m_affectedByFocus = false;
-        noninherited_data.m_affectedByHover = false;
-        noninherited_data.m_affectedByActive = false;
-        noninherited_data.m_affectedByDrag = false;
-        noninherited_data.m_isLink = false;
-        noninherited_data.m_hasRemUnits = false;
+        m_nonInheritedData.m_effectiveDisplay = m_nonInheritedData.m_originalDisplay = initialDisplay();
+        m_nonInheritedData.m_overflowX = initialOverflowX();
+        m_nonInheritedData.m_overflowY = initialOverflowY();
+        m_nonInheritedData.m_verticalAlign = initialVerticalAlign();
+        m_nonInheritedData.m_clear = initialClear();
+        m_nonInheritedData.m_position = initialPosition();
+        m_nonInheritedData.m_floating = initialFloating();
+        m_nonInheritedData.m_tableLayout = initialTableLayout();
+        m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi();
+        m_nonInheritedData.m_breakBefore = initialBreakBefore();
+        m_nonInheritedData.m_breakAfter = initialBreakAfter();
+        m_nonInheritedData.m_breakInside = initialBreakInside();
+        m_nonInheritedData.m_styleType = PseudoIdNone;
+        m_nonInheritedData.m_pseudoBits = 0;
+        m_nonInheritedData.m_explicitInheritance = false;
+        m_nonInheritedData.m_variableReference = false;
+        m_nonInheritedData.m_unique = false;
+        m_nonInheritedData.m_emptyState = false;
+        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;
     }
 
 private:
     ALWAYS_INLINE ComputedStyle();
 
     enum InitialStyleTag {
         InitialStyle
     };
     ALWAYS_INLINE explicit ComputedStyle(InitialStyleTag);
     ALWAYS_INLINE ComputedStyle(const ComputedStyle&);
@@ skipping 27 matching lines @@
     StyleDifference visualInvalidationDiff(const ComputedStyle&) const;
 
     enum IsAtShadowBoundary {
         AtShadowBoundary,
         NotAtShadowBoundary,
     };
 
     void inheritFrom(const ComputedStyle& inheritParent, IsAtShadowBoundary = NotAtShadowBoundary);
     void copyNonInheritedFromCached(const ComputedStyle&);
 
-    PseudoId styleType() const { return static_cast<PseudoId>(noninherited_data.m_styleType); }
-    void setStyleType(PseudoId styleType) { noninherited_data.m_styleType = styleType; }
+    PseudoId styleType() const { return static_cast<PseudoId>(m_nonInheritedData.m_styleType); }
+    void setStyleType(PseudoId styleType) { m_nonInheritedData.m_styleType = styleType; }
 
     ComputedStyle* getCachedPseudoStyle(PseudoId) const;
     ComputedStyle* addCachedPseudoStyle(PassRefPtr<ComputedStyle>);
     void removeCachedPseudoStyle(PseudoId);
 
     const PseudoStyleCache* cachedPseudoStyles() const { return m_cachedPseudoStyles.get(); }
 
-    void setHasViewportUnits(bool hasViewportUnits = true) const { noninherited_data.m_hasViewportUnits = hasViewportUnits; }
-    bool hasViewportUnits() const { return noninherited_data.m_hasViewportUnits; }
+    void setHasViewportUnits(bool hasViewportUnits = true) const { m_nonInheritedData.m_hasViewportUnits = hasViewportUnits; }
+    bool hasViewportUnits() const { return m_nonInheritedData.m_hasViewportUnits; }
 
-    void setHasRemUnits() const { noninherited_data.m_hasRemUnits = true; }
-    bool hasRemUnits() const { return noninherited_data.m_hasRemUnits; }
+    void setHasRemUnits() const { m_nonInheritedData.m_hasRemUnits = true; }
+    bool hasRemUnits() const { return m_nonInheritedData.m_hasRemUnits; }
 
-    bool affectedByFocus() const { return noninherited_data.m_affectedByFocus; }
-    bool affectedByHover() const { return noninherited_data.m_affectedByHover; }
-    bool affectedByActive() const { return noninherited_data.m_affectedByActive; }
-    bool affectedByDrag() const { return noninherited_data.m_affectedByDrag; }
+    bool affectedByFocus() const { return m_nonInheritedData.m_affectedByFocus; }
+    bool affectedByHover() const { return m_nonInheritedData.m_affectedByHover; }
+    bool affectedByActive() const { return m_nonInheritedData.m_affectedByActive; }
+    bool affectedByDrag() const { return m_nonInheritedData.m_affectedByDrag; }
 
-    void setAffectedByFocus() { noninherited_data.m_affectedByFocus = true; }
-    void setAffectedByHover() { noninherited_data.m_affectedByHover = true; }
-    void setAffectedByActive() { noninherited_data.m_affectedByActive = true; }
-    void setAffectedByDrag() { noninherited_data.m_affectedByDrag = true; }
+    void setAffectedByFocus() { m_nonInheritedData.m_affectedByFocus = true; }
+    void setAffectedByHover() { m_nonInheritedData.m_affectedByHover = true; }
+    void setAffectedByActive() { m_nonInheritedData.m_affectedByActive = true; }
+    void setAffectedByDrag() { m_nonInheritedData.m_affectedByDrag = true; }
 
     bool operator==(const ComputedStyle& other) const;
     bool operator!=(const ComputedStyle& other) const { return !(*this == other); }
-    bool isFloating() const { return noninherited_data.m_floating != NoFloat; }
-    bool hasMargin() const { return surround->margin.nonZero(); }
-    bool hasBorderFill() const { return surround->border.hasBorderFill(); }
-    bool hasBorder() const { return surround->border.hasBorder(); }
+    bool isFloating() const { return m_nonInheritedData.m_floating != NoFloat; }
+    bool hasMargin() const { return m_surround->margin.nonZero(); }
+    bool hasBorderFill() const { return m_surround->border.hasBorderFill(); }
+    bool hasBorder() const { return m_surround->border.hasBorder(); }
     bool hasBorderDecoration() const { return hasBorder() || hasBorderFill(); }
-    bool hasPadding() const { return surround->padding.nonZero(); }
+    bool hasPadding() const { return m_surround->padding.nonZero(); }
     bool hasMarginBeforeQuirk() const { return marginBefore().quirk(); }
     bool hasMarginAfterQuirk() const { return marginAfter().quirk(); }
 
     bool hasBackgroundImage() const { return m_background->background().hasImage(); }
     bool hasFixedBackgroundImage() const { return m_background->background().hasFixedImage(); }
 
     bool hasEntirelyFixedBackground() const;
 
     bool hasAppearance() const { return appearance() != NoControlPart; }
 
@@ skipping 32 matching lines @@
     // of creating stacking contexts.
     bool hasNonInitialOpacity() const { return hasOpacity() || hasWillChangeOpacityHint() || hasCurrentOpacityAnimation(); }
 
     // Returns whether this style contains any grouping property as defined by [css-transforms].
     // The main purpose of this is to adjust the used value of transform-style property.
     // Note: We currently don't include every grouping property on the spec to maintain
     //       backward compatibility.
     // [css-transforms] https://drafts.csswg.org/css-transforms/#grouping-property-values
     bool hasGroupingProperty() const { return !isOverflowVisible() || hasFilterInducingProperty() || hasNonInitialOpacity(); }
 
-    Order rtlOrdering() const { return static_cast<Order>(inherited_data.m_rtlOrdering); }
-    void setRTLOrdering(Order o) { inherited_data.m_rtlOrdering = o; }
+    Order rtlOrdering() const { return static_cast<Order>(m_inheritedData.m_rtlOrdering); }
+    void setRTLOrdering(Order o) { m_inheritedData.m_rtlOrdering = o; }
 
     bool isStyleAvailable() const;
 
     bool hasAnyPublicPseudoStyles() const;
     bool hasPseudoStyle(PseudoId) const;
     void setHasPseudoStyle(PseudoId);
     bool hasUniquePseudoStyle() const;
     bool hasPseudoElementStyle() const;
 
     bool canContainAbsolutePositionObjects() const { return position() != StaticPosition; }
     bool canContainFixedPositionObjects() const { return hasTransformRelatedProperty() || containsPaint();}
 
     // attribute getter methods
 
-    EDisplay display() const { return static_cast<EDisplay>(noninherited_data.m_effectiveDisplay); }
-    EDisplay originalDisplay() const { return static_cast<EDisplay>(noninherited_data.m_originalDisplay); }
+    EDisplay display() const { return static_cast<EDisplay>(m_nonInheritedData.m_effectiveDisplay); }
+    EDisplay originalDisplay() const { return static_cast<EDisplay>(m_nonInheritedData.m_originalDisplay); }
 
-    const Length& left() const { return surround->offset.left(); }
-    const Length& right() const { return surround->offset.right(); }
-    const Length& top() const { return surround->offset.top(); }
-    const Length& bottom() const { return surround->offset.bottom(); }
+    const Length& left() const { return m_surround->offset.left(); }
+    const Length& right() const { return m_surround->offset.right(); }
+    const Length& top() const { return m_surround->offset.top(); }
+    const Length& bottom() const { return m_surround->offset.bottom(); }
 
     // Accessors for positioned object edges that take into account writing mode.
-    const Length& logicalLeft() const { return surround->offset.logicalLeft(getWritingMode()); }
-    const Length& logicalRight() const { return surround->offset.logicalRight(getWritingMode()); }
-    const Length& logicalTop() const { return surround->offset.before(getWritingMode()); }
-    const Length& logicalBottom() const { return surround->offset.after(getWritingMode()); }
+    const Length& logicalLeft() const { return m_surround->offset.logicalLeft(getWritingMode()); }
+    const Length& logicalRight() const { return m_surround->offset.logicalRight(getWritingMode()); }
+    const Length& logicalTop() const { return m_surround->offset.before(getWritingMode()); }
+    const Length& logicalBottom() const { return m_surround->offset.after(getWritingMode()); }
 
     // Whether or not a positioned element requires normal flow x/y to be computed
     // to determine its position.
     bool hasAutoLeftAndRight() const { return left().isAuto() && right().isAuto(); }
     bool hasAutoTopAndBottom() const { return top().isAuto() && bottom().isAuto(); }
     bool hasStaticInlinePosition(bool horizontal) const { return horizontal ? hasAutoLeftAndRight() : hasAutoTopAndBottom(); }
     bool hasStaticBlockPosition(bool horizontal) const { return horizontal ? hasAutoTopAndBottom() : hasAutoLeftAndRight(); }
 
-    EPosition position() const { return static_cast<EPosition>(noninherited_data.m_position); }
+    EPosition position() const { return static_cast<EPosition>(m_nonInheritedData.m_position); }
     bool hasOutOfFlowPosition() const { return position() == AbsolutePosition || position() == FixedPosition; }
     bool hasInFlowPosition() const { return position() == RelativePosition || position() == StickyPosition; }
     bool hasViewportConstrainedPosition() const { return position() == FixedPosition || position() == StickyPosition; }
-    EFloat floating() const { return static_cast<EFloat>(noninherited_data.m_floating); }
+    EFloat floating() const { return static_cast<EFloat>(m_nonInheritedData.m_floating); }
 
     const Length& width() const { return m_box->width(); }
     const Length& height() const { return m_box->height(); }
     const Length& minWidth() const { return m_box->minWidth(); }
     const Length& maxWidth() const { return m_box->maxWidth(); }
     const Length& minHeight() const { return m_box->minHeight(); }
     const Length& maxHeight() const { return m_box->maxHeight(); }
 
     const Length& logicalWidth() const { return isHorizontalWritingMode() ? width() : height(); }
     const Length& logicalHeight() const { return isHorizontalWritingMode() ? height() : width(); }
     const Length& logicalMinWidth() const { return isHorizontalWritingMode() ? minWidth() : minHeight(); }
     const Length& logicalMaxWidth() const { return isHorizontalWritingMode() ? maxWidth() : maxHeight(); }
     const Length& logicalMinHeight() const { return isHorizontalWritingMode() ? minHeight() : minWidth(); }
     const Length& logicalMaxHeight() const { return isHorizontalWritingMode() ? maxHeight() : maxWidth(); }
 
-    const BorderData& border() const { return surround->border; }
-    const BorderValue& borderLeft() const { return surround->border.left(); }
-    const BorderValue& borderRight() const { return surround->border.right(); }
-    const BorderValue& borderTop() const { return surround->border.top(); }
-    const BorderValue& borderBottom() const { return surround->border.bottom(); }
+    const BorderData& border() const { return m_surround->border; }
+    const BorderValue& borderLeft() const { return m_surround->border.left(); }
+    const BorderValue& borderRight() const { return m_surround->border.right(); }
+    const BorderValue& borderTop() const { return m_surround->border.top(); }
+    const BorderValue& borderBottom() const { return m_surround->border.bottom(); }
 
     const BorderValue& borderBefore() const;
     const BorderValue& borderAfter() const;
     const BorderValue& borderStart() const;
     const BorderValue& borderEnd() const;
 
-    const NinePieceImage& borderImage() const { return surround->border.image(); }
-    StyleImage* borderImageSource() const { return surround->border.image().image(); }
-    const LengthBox& borderImageSlices() const { return surround->border.image().imageSlices(); }
-    bool borderImageSlicesFill() const { return surround->border.image().fill(); }
-    const BorderImageLengthBox& borderImageWidth() const { return surround->border.image().borderSlices(); }
-    const BorderImageLengthBox& borderImageOutset() const { return surround->border.image().outset(); }
+    const NinePieceImage& borderImage() const { return m_surround->border.image(); }
+    StyleImage* borderImageSource() const { return m_surround->border.image().image(); }
+    const LengthBox& borderImageSlices() const { return m_surround->border.image().imageSlices(); }
+    bool borderImageSlicesFill() const { return m_surround->border.image().fill(); }
+    const BorderImageLengthBox& borderImageWidth() const { return m_surround->border.image().borderSlices(); }
+    const BorderImageLengthBox& borderImageOutset() const { return m_surround->border.image().outset(); }
 
-    const LengthSize& borderTopLeftRadius() const { return surround->border.topLeft(); }
-    const LengthSize& borderTopRightRadius() const { return surround->border.topRight(); }
-    const LengthSize& borderBottomLeftRadius() const { return surround->border.bottomLeft(); }
-    const LengthSize& borderBottomRightRadius() const { return surround->border.bottomRight(); }
-    bool hasBorderRadius() const { return surround->border.hasBorderRadius(); }
+    const LengthSize& borderTopLeftRadius() const { return m_surround->border.topLeft(); }
+    const LengthSize& borderTopRightRadius() const { return m_surround->border.topRight(); }
+    const LengthSize& borderBottomLeftRadius() const { return m_surround->border.bottomLeft(); }
+    const LengthSize& borderBottomRightRadius() const { return m_surround->border.bottomRight(); }
+    bool hasBorderRadius() const { return m_surround->border.hasBorderRadius(); }
 
-    int borderLeftWidth() const { return surround->border.borderLeftWidth(); }
-    EBorderStyle borderLeftStyle() const { return surround->border.left().style(); }
-    int borderRightWidth() const { return surround->border.borderRightWidth(); }
-    EBorderStyle borderRightStyle() const { return surround->border.right().style(); }
-    int borderTopWidth() const { return surround->border.borderTopWidth(); }
-    EBorderStyle borderTopStyle() const { return surround->border.top().style(); }
-    int borderBottomWidth() const { return surround->border.borderBottomWidth(); }
-    EBorderStyle borderBottomStyle() const { return surround->border.bottom().style(); }
+    int borderLeftWidth() const { return m_surround->border.borderLeftWidth(); }
+    EBorderStyle borderLeftStyle() const { return m_surround->border.left().style(); }
+    int borderRightWidth() const { return m_surround->border.borderRightWidth(); }
+    EBorderStyle borderRightStyle() const { return m_surround->border.right().style(); }
+    int borderTopWidth() const { return m_surround->border.borderTopWidth(); }
+    EBorderStyle borderTopStyle() const { return m_surround->border.top().style(); }
+    int borderBottomWidth() const { return m_surround->border.borderBottomWidth(); }
+    EBorderStyle borderBottomStyle() const { return m_surround->border.bottom().style(); }
 
     int borderBeforeWidth() const;
     int borderAfterWidth() const;
     int borderStartWidth() const;
     int borderEndWidth() const;
     int borderOverWidth() const;
     int borderUnderWidth() const;
 
     int outlineWidth() const
     {
         if (m_background->outline().style() == BorderStyleNone)
             return 0;
         return m_background->outline().width();
     }
     bool hasOutline() const { return outlineWidth() > 0 && outlineStyle() > BorderStyleHidden; }
     EBorderStyle outlineStyle() const { return m_background->outline().style(); }
     OutlineIsAuto outlineStyleIsAuto() const { return static_cast<OutlineIsAuto>(m_background->outline().isAuto()); }
     int outlineOutsetExtent() const;
 
-    EOverflow overflowX() const { return static_cast<EOverflow>(noninherited_data.m_overflowX); }
-    EOverflow overflowY() const { return static_cast<EOverflow>(noninherited_data.m_overflowY); }
+    EOverflow overflowX() const { return static_cast<EOverflow>(m_nonInheritedData.m_overflowX); }
+    EOverflow overflowY() const { return static_cast<EOverflow>(m_nonInheritedData.m_overflowY); }
     // It's sufficient to just check one direction, since it's illegal to have visible on only one overflow value.
     bool isOverflowVisible() const { ASSERT(overflowX() != OverflowVisible || overflowX() == overflowY()); return overflowX() == OverflowVisible; }
     bool isOverflowPaged() const { return overflowY() == OverflowPagedX || overflowY() == OverflowPagedY; }
 
-    EVisibility visibility() const { return static_cast<EVisibility>(inherited_data.m_visibility); }
-    EVerticalAlign verticalAlign() const { return static_cast<EVerticalAlign>(noninherited_data.m_verticalAlign); }
+    EVisibility visibility() const { return static_cast<EVisibility>(m_inheritedData.m_visibility); }
+    EVerticalAlign verticalAlign() const { return static_cast<EVerticalAlign>(m_nonInheritedData.m_verticalAlign); }
     const Length& getVerticalAlignLength() const { return m_box->verticalAlign(); }
 
-    const Length& clipLeft() const { return visual->clip.left(); }
-    const Length& clipRight() const { return visual->clip.right(); }
-    const Length& clipTop() const { return visual->clip.top(); }
-    const Length& clipBottom() const { return visual->clip.bottom(); }
-    const LengthBox& clip() const { return visual->clip; }
-    bool hasAutoClip() const { return visual->hasAutoClip; }
+    const Length& clipLeft() const { return m_visual->clip.left(); }
+    const Length& clipRight() const { return m_visual->clip.right(); }
+    const Length& clipTop() const { return m_visual->clip.top(); }
+    const Length& clipBottom() const { return m_visual->clip.bottom(); }
+    const LengthBox& clip() const { return m_visual->clip; }
+    bool hasAutoClip() const { return m_visual->hasAutoClip; }
 
-    EUnicodeBidi unicodeBidi() const { return static_cast<EUnicodeBidi>(noninherited_data.m_unicodeBidi); }
+    EUnicodeBidi unicodeBidi() const { return static_cast<EUnicodeBidi>(m_nonInheritedData.m_unicodeBidi); }
 
-    EClear clear() const { return static_cast<EClear>(noninherited_data.m_clear); }
-    ETableLayout tableLayout() const { return static_cast<ETableLayout>(noninherited_data.m_tableLayout); }
+    EClear clear() const { return static_cast<EClear>(m_nonInheritedData.m_clear); }
+    ETableLayout tableLayout() const { return static_cast<ETableLayout>(m_nonInheritedData.m_tableLayout); }
     bool isFixedTableLayout() const { return tableLayout() == TableLayoutFixed && !logicalWidth().isAuto(); }
 
     const Font& font() const;
     const FontMetrics& getFontMetrics() const;
     const FontDescription& getFontDescription() const;
     float specifiedFontSize() const;
     float computedFontSize() const;
     int fontSize() const;
     float fontSizeAdjust() const;
     bool hasFontSizeAdjust() const;
     FontWeight fontWeight() const;
     FontStretch fontStretch() const;
 
-    float textAutosizingMultiplier() const { return inherited->textAutosizingMultiplier; }
+    float textAutosizingMultiplier() const { return m_styleInheritedData->textAutosizingMultiplier; }
 
-    const Length& textIndent() const { return rareInheritedData->indent; }
-    TextIndentLine getTextIndentLine() const { return static_cast<TextIndentLine>(rareInheritedData->m_textIndentLine); }
-    TextIndentType getTextIndentType() const { return static_cast<TextIndentType>(rareInheritedData->m_textIndentType); }
-    ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_data.m_textAlign); }
-    TextAlignLast getTextAlignLast() const { return static_cast<TextAlignLast>(rareInheritedData->m_textAlignLast); }
-    TextJustify getTextJustify() const { return static_cast<TextJustify>(rareInheritedData->m_textJustify); }
-    ETextTransform textTransform() const { return static_cast<ETextTransform>(inherited_data.m_textTransform); }
+    const Length& textIndent() const { return m_rareInheritedData->indent; }
+    TextIndentLine getTextIndentLine() const { return static_cast<TextIndentLine>(m_rareInheritedData->m_textIndentLine); }
+    TextIndentType getTextIndentType() const { return static_cast<TextIndentType>(m_rareInheritedData->m_textIndentType); }
+    ETextAlign textAlign() const { return static_cast<ETextAlign>(m_inheritedData.m_textAlign); }
+    TextAlignLast getTextAlignLast() const { return static_cast<TextAlignLast>(m_rareInheritedData->m_textAlignLast); }
+    TextJustify getTextJustify() const { return static_cast<TextJustify>(m_rareInheritedData->m_textJustify); }
+    ETextTransform textTransform() const { return static_cast<ETextTransform>(m_inheritedData.m_textTransform); }
     TextDecoration textDecorationsInEffect() const;
     const Vector<AppliedTextDecoration>& appliedTextDecorations() const;
-    TextDecoration getTextDecoration() const { return static_cast<TextDecoration>(visual->textDecoration); }
-    TextUnderlinePosition getTextUnderlinePosition() const { return static_cast<TextUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); }
-    TextDecorationStyle getTextDecorationStyle() const { return static_cast<TextDecorationStyle>(rareNonInheritedData->m_textDecorationStyle); }
+    TextDecoration getTextDecoration() const { return static_cast<TextDecoration>(m_visual->textDecoration); }
+    TextUnderlinePosition getTextUnderlinePosition() const { return static_cast<TextUnderlinePosition>(m_rareInheritedData->m_textUnderlinePosition); }
+    TextDecorationStyle getTextDecorationStyle() const { return static_cast<TextDecorationStyle>(m_rareNonInheritedData->m_textDecorationStyle); }
     float wordSpacing() const;
     float letterSpacing() const;
     StyleVariableData* variables() const;
 
     void setVariable(const AtomicString&, PassRefPtr<CSSVariableData>);
     void removeVariable(const AtomicString&);
 
-    float zoom() const { return visual->m_zoom; }
-    float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; }
+    float zoom() const { return m_visual->m_zoom; }
+    float effectiveZoom() const { return m_rareInheritedData->m_effectiveZoom; }
 
-    TextDirection direction() const { return static_cast<TextDirection>(inherited_data.m_direction); }
+    TextDirection direction() const { return static_cast<TextDirection>(m_inheritedData.m_direction); }
     bool isLeftToRightDirection() const { return direction() == LTR; }
-    bool selfOrAncestorHasDirAutoAttribute() const { return rareInheritedData->m_selfOrAncestorHasDirAutoAttribute; }
+    bool selfOrAncestorHasDirAutoAttribute() const { return m_rareInheritedData->m_selfOrAncestorHasDirAutoAttribute; }
 
     const Length& specifiedLineHeight() const;
     Length lineHeight() const;
     int computedLineHeight() const;
 
-    EWhiteSpace whiteSpace() const { return static_cast<EWhiteSpace>(inherited_data.m_whiteSpace); }
+    EWhiteSpace whiteSpace() const { return static_cast<EWhiteSpace>(m_inheritedData.m_whiteSpace); }
     static bool autoWrap(EWhiteSpace ws)
     {
         // Nowrap and pre don't automatically wrap.
         return ws != NOWRAP && ws != PRE;
     }
 
     bool autoWrap() const
     {
         return autoWrap(whiteSpace());
     }
@@ skipping 40 matching lines @@
     bool breakWords() const
     {
         return (wordBreak() == BreakWordBreak || overflowWrap() == BreakOverflowWrap)
             && whiteSpace() != PRE && whiteSpace() != NOWRAP;
     }
 
     EFillBox backgroundClip() const { return static_cast<EFillBox>(m_background->background().clip()); }
     FillLayer& accessBackgroundLayers() { return m_background.access()->m_background; }
     const FillLayer& backgroundLayers() const { return m_background->background(); }
 
-    StyleImage* maskImage() const { return rareNonInheritedData->m_mask.image(); }
-    FillLayer& accessMaskLayers() { return rareNonInheritedData.access()->m_mask; }
-    const FillLayer& maskLayers() const { return rareNonInheritedData->m_mask; }
+    StyleImage* maskImage() const { return m_rareNonInheritedData->m_mask.image(); }
+    FillLayer& accessMaskLayers() { return m_rareNonInheritedData.access()->m_mask; }
+    const FillLayer& maskLayers() const { return m_rareNonInheritedData->m_mask; }
 
-    const NinePieceImage& maskBoxImage() const { return rareNonInheritedData->m_maskBoxImage; }
-    StyleImage* maskBoxImageSource() const { return rareNonInheritedData->m_maskBoxImage.image(); }
-    const LengthBox& maskBoxImageSlices() const { return rareNonInheritedData->m_maskBoxImage.imageSlices(); }
-    bool maskBoxImageSlicesFill() const { return rareNonInheritedData->m_maskBoxImage.fill(); }
-    const BorderImageLengthBox& maskBoxImageWidth() const { return rareNonInheritedData->m_maskBoxImage.borderSlices(); }
-    const BorderImageLengthBox& maskBoxImageOutset() const { return rareNonInheritedData->m_maskBoxImage.outset(); }
+    const NinePieceImage& maskBoxImage() const { return m_rareNonInheritedData->m_maskBoxImage; }
+    StyleImage* maskBoxImageSource() const { return m_rareNonInheritedData->m_maskBoxImage.image(); }
+    const LengthBox& maskBoxImageSlices() const { return m_rareNonInheritedData->m_maskBoxImage.imageSlices(); }
+    bool maskBoxImageSlicesFill() const { return m_rareNonInheritedData->m_maskBoxImage.fill(); }
+    const BorderImageLengthBox& maskBoxImageWidth() const { return m_rareNonInheritedData->m_maskBoxImage.borderSlices(); }
+    const BorderImageLengthBox& maskBoxImageOutset() const { return m_rareNonInheritedData->m_maskBoxImage.outset(); }
 
-    EBorderCollapse borderCollapse() const { return static_cast<EBorderCollapse>(inherited_data.m_borderCollapse); }
+    EBorderCollapse borderCollapse() const { return static_cast<EBorderCollapse>(m_inheritedData.m_borderCollapse); }
     short horizontalBorderSpacing() const;
     short verticalBorderSpacing() const;
-    EEmptyCells emptyCells() const { return static_cast<EEmptyCells>(inherited_data.m_emptyCells); }
-    ECaptionSide captionSide() const { return static_cast<ECaptionSide>(inherited_data.m_captionSide); }
+    EEmptyCells emptyCells() const { return static_cast<EEmptyCells>(m_inheritedData.m_emptyCells); }
+    ECaptionSide captionSide() const { return static_cast<ECaptionSide>(m_inheritedData.m_captionSide); }
 
-    EListStyleType listStyleType() const { return static_cast<EListStyleType>(inherited_data.m_listStyleType); }
+    EListStyleType listStyleType() const { return static_cast<EListStyleType>(m_inheritedData.m_listStyleType); }
     StyleImage* listStyleImage() const;
-    EListStylePosition listStylePosition() const { return static_cast<EListStylePosition>(inherited_data.m_listStylePosition); }
+    EListStylePosition listStylePosition() const { return static_cast<EListStylePosition>(m_inheritedData.m_listStylePosition); }
 
-    const Length& marginTop() const { return surround->margin.top(); }
-    const Length& marginBottom() const { return surround->margin.bottom(); }
-    const Length& marginLeft() const { return surround->margin.left(); }
-    const Length& marginRight() const { return surround->margin.right(); }
-    const Length& marginBefore() const { return surround->margin.before(getWritingMode()); }
-    const Length& marginAfter() const { return surround->margin.after(getWritingMode()); }
-    const Length& marginStart() const { return surround->margin.start(getWritingMode(), direction()); }
-    const Length& marginEnd() const { return surround->margin.end(getWritingMode(), direction()); }
-    const Length& marginOver() const { return surround->margin.over(getWritingMode()); }
-    const Length& marginUnder() const { return surround->margin.under(getWritingMode()); }
-    const Length& marginStartUsing(const ComputedStyle* otherStyle) const { return surround->margin.start(otherStyle->getWritingMode(), otherStyle->direction()); }
-    const Length& marginEndUsing(const ComputedStyle* otherStyle) const { return surround->margin.end(otherStyle->getWritingMode(), otherStyle->direction()); }
-    const Length& marginBeforeUsing(const ComputedStyle* otherStyle) const { return surround->margin.before(otherStyle->getWritingMode()); }
-    const Length& marginAfterUsing(const ComputedStyle* otherStyle) const { return surround->margin.after(otherStyle->getWritingMode()); }
+    const Length& marginTop() const { return m_surround->margin.top(); }
+    const Length& marginBottom() const { return m_surround->margin.bottom(); }
+    const Length& marginLeft() const { return m_surround->margin.left(); }
+    const Length& marginRight() const { return m_surround->margin.right(); }
+    const Length& marginBefore() const { return m_surround->margin.before(getWritingMode()); }
+    const Length& marginAfter() const { return m_surround->margin.after(getWritingMode()); }
+    const Length& marginStart() const { return m_surround->margin.start(getWritingMode(), direction()); }
+    const Length& marginEnd() const { return m_surround->margin.end(getWritingMode(), direction()); }
+    const Length& marginOver() const { return m_surround->margin.over(getWritingMode()); }
+    const Length& marginUnder() const { return m_surround->margin.under(getWritingMode()); }
+    const Length& marginStartUsing(const ComputedStyle* otherStyle) const { return m_surround->margin.start(otherStyle->getWritingMode(), otherStyle->direction()); }
+    const Length& marginEndUsing(const ComputedStyle* otherStyle) const { return m_surround->margin.end(otherStyle->getWritingMode(), otherStyle->direction()); }
+    const Length& marginBeforeUsing(const ComputedStyle* otherStyle) const { return m_surround->margin.before(otherStyle->getWritingMode()); }
+    const Length& marginAfterUsing(const ComputedStyle* otherStyle) const { return m_surround->margin.after(otherStyle->getWritingMode()); }
 
-    const LengthBox& paddingBox() const { return surround->padding; }
-    const Length& paddingTop() const { return surround->padding.top(); }
-    const Length& paddingBottom() const { return surround->padding.bottom(); }
-    const Length& paddingLeft() const { return surround->padding.left(); }
-    const Length& paddingRight() const { return surround->padding.right(); }
-    const Length& paddingBefore() const { return surround->padding.before(getWritingMode()); }
-    const Length& paddingAfter() const { return surround->padding.after(getWritingMode()); }
-    const Length& paddingStart() const { return surround->padding.start(getWritingMode(), direction()); }
-    const Length& paddingEnd() const { return surround->padding.end(getWritingMode(), direction()); }
-    const Length& paddingOver() const { return surround->padding.over(getWritingMode()); }
-    const Length& paddingUnder() const { return surround->padding.under(getWritingMode()); }
+    const LengthBox& paddingBox() const { return m_surround->padding; }
+    const Length& paddingTop() const { return m_surround->padding.top(); }
+    const Length& paddingBottom() const { return m_surround->padding.bottom(); }
+    const Length& paddingLeft() const { return m_surround->padding.left(); }
+    const Length& paddingRight() const { return m_surround->padding.right(); }
+    const Length& paddingBefore() const { return m_surround->padding.before(getWritingMode()); }
+    const Length& paddingAfter() const { return m_surround->padding.after(getWritingMode()); }
+    const Length& paddingStart() const { return m_surround->padding.start(getWritingMode(), direction()); }
+    const Length& paddingEnd() const { return m_surround->padding.end(getWritingMode(), direction()); }
+    const Length& paddingOver() const { return m_surround->padding.over(getWritingMode()); }
+    const Length& paddingUnder() const { return m_surround->padding.under(getWritingMode()); }
 
-    ECursor cursor() const { return static_cast<ECursor>(inherited_data.m_cursorStyle); }
-    CursorList* cursors() const { return rareInheritedData->cursorData.get(); }
+    ECursor cursor() const { return static_cast<ECursor>(m_inheritedData.m_cursorStyle); }
+    CursorList* cursors() const { return m_rareInheritedData->cursorData.get(); }
 
-    EInsideLink insideLink() const { return static_cast<EInsideLink>(inherited_data.m_insideLink); }
-    bool isLink() const { return noninherited_data.m_isLink; }
+    EInsideLink insideLink() const { return static_cast<EInsideLink>(m_inheritedData.m_insideLink); }
+    bool isLink() const { return m_nonInheritedData.m_isLink; }
 
-    short widows() const { return rareInheritedData->widows; }
-    short orphans() const { return rareInheritedData->orphans; }
-    EBreak breakAfter() const { return static_cast<EBreak>(noninherited_data.m_breakAfter); }
-    EBreak breakBefore() const { return static_cast<EBreak>(noninherited_data.m_breakBefore); }
-    EBreak breakInside() const { return static_cast<EBreak>(noninherited_data.m_breakInside); }
+    short widows() const { return m_rareInheritedData->widows; }
+    short orphans() const { return m_rareInheritedData->orphans; }
+    EBreak breakAfter() const { return static_cast<EBreak>(m_nonInheritedData.m_breakAfter); }
+    EBreak breakBefore() const { return static_cast<EBreak>(m_nonInheritedData.m_breakBefore); }
+    EBreak breakInside() const { return static_cast<EBreak>(m_nonInheritedData.m_breakInside); }
 
-    TextSizeAdjust getTextSizeAdjust() const { return rareInheritedData->m_textSizeAdjust; }
+    TextSizeAdjust getTextSizeAdjust() const { return m_rareInheritedData->m_textSizeAdjust; }
 
     // CSS3 Getter Methods
 
     int outlineOffset() const
     {
         if (m_background->outline().style() == BorderStyleNone)
             return 0;
         return m_background->outline().offset();
     }
 
-    ShadowList* textShadow() const { return rareInheritedData->textShadow.get(); }
+    ShadowList* textShadow() const { return m_rareInheritedData->textShadow.get(); }
 
-    float textStrokeWidth() const { return rareInheritedData->textStrokeWidth; }
-    float opacity() const { return rareNonInheritedData->opacity; }
+    float textStrokeWidth() const { return m_rareInheritedData->textStrokeWidth; }
+    float opacity() const { return m_rareNonInheritedData->opacity; }
     bool hasOpacity() const { return opacity() < 1.0f; }
-    ControlPart appearance() const { return static_cast<ControlPart>(rareNonInheritedData->m_appearance); }
-    EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(rareNonInheritedData->m_deprecatedFlexibleBox->align); }
-    EBoxDirection boxDirection() const { return static_cast<EBoxDirection>(inherited_data.m_boxDirection); }
-    float boxFlex() const { return rareNonInheritedData->m_deprecatedFlexibleBox->flex; }
-    unsigned boxFlexGroup() const { return rareNonInheritedData->m_deprecatedFlexibleBox->flexGroup; }
-    EBoxLines boxLines() const { return static_cast<EBoxLines>(rareNonInheritedData->m_deprecatedFlexibleBox->lines); }
-    unsigned boxOrdinalGroup() const { return rareNonInheritedData->m_deprecatedFlexibleBox->ordinalGroup; }
-    EBoxOrient boxOrient() const { return static_cast<EBoxOrient>(rareNonInheritedData->m_deprecatedFlexibleBox->orient); }
-    EBoxPack boxPack() const { return static_cast<EBoxPack>(rareNonInheritedData->m_deprecatedFlexibleBox->pack); }
+    ControlPart appearance() const { return static_cast<ControlPart>(m_rareNonInheritedData->m_appearance); }
+    EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(m_rareNonInheritedData->m_deprecatedFlexibleBox->align); }
+    EBoxDirection boxDirection() const { return static_cast<EBoxDirection>(m_inheritedData.m_boxDirection); }
+    float boxFlex() const { return m_rareNonInheritedData->m_deprecatedFlexibleBox->flex; }
+    unsigned boxFlexGroup() const { return m_rareNonInheritedData->m_deprecatedFlexibleBox->flexGroup; }
+    EBoxLines boxLines() const { return static_cast<EBoxLines>(m_rareNonInheritedData->m_deprecatedFlexibleBox->lines); }
+    unsigned boxOrdinalGroup() const { return m_rareNonInheritedData->m_deprecatedFlexibleBox->ordinalGroup; }
+    EBoxOrient boxOrient() const { return static_cast<EBoxOrient>(m_rareNonInheritedData->m_deprecatedFlexibleBox->orient); }
+    EBoxPack boxPack() const { return static_cast<EBoxPack>(m_rareNonInheritedData->m_deprecatedFlexibleBox->pack); }
 
-    int order() const { return rareNonInheritedData->m_order; }
-    const Vector<String>& callbackSelectors() const { return rareNonInheritedData->m_callbackSelectors; }
-    float flexGrow() const { return rareNonInheritedData->m_flexibleBox->m_flexGrow; }
-    float flexShrink() const { return rareNonInheritedData->m_flexibleBox->m_flexShrink; }
-    const Length& flexBasis() const { return rareNonInheritedData->m_flexibleBox->m_flexBasis; }
-    const StyleContentAlignmentData& alignContent() const { return rareNonInheritedData->m_alignContent; }
-    ContentPosition alignContentPosition() const { return rareNonInheritedData->m_alignContent.position(); }
-    ContentDistributionType alignContentDistribution() const { return rareNonInheritedData->m_alignContent.distribution(); }
-    OverflowAlignment alignContentOverflowAlignment() const { return rareNonInheritedData->m_alignContent.overflow(); }
-    const StyleSelfAlignmentData& alignItems() const { return rareNonInheritedData->m_alignItems; }
-    ItemPosition alignItemsPosition() const { return rareNonInheritedData->m_alignItems.position(); }
-    OverflowAlignment alignItemsOverflowAlignment() const { return rareNonInheritedData->m_alignItems.overflow(); }
-    const StyleSelfAlignmentData& alignSelf() const { return rareNonInheritedData->m_alignSelf; }
-    ItemPosition alignSelfPosition() const { return rareNonInheritedData->m_alignSelf.position(); }
-    OverflowAlignment alignSelfOverflowAlignment() const { return rareNonInheritedData->m_alignSelf.overflow(); }
-    EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(rareNonInheritedData->m_flexibleBox->m_flexDirection); }
+    int order() const { return m_rareNonInheritedData->m_order; }
+    const Vector<String>& callbackSelectors() const { return m_rareNonInheritedData->m_callbackSelectors; }
+    float flexGrow() const { return m_rareNonInheritedData->m_flexibleBox->m_flexGrow; }
+    float flexShrink() const { return m_rareNonInheritedData->m_flexibleBox->m_flexShrink; }
+    const Length& flexBasis() const { return m_rareNonInheritedData->m_flexibleBox->m_flexBasis; }
+    const StyleContentAlignmentData& alignContent() const { return m_rareNonInheritedData->m_alignContent; }
+    ContentPosition alignContentPosition() const { return m_rareNonInheritedData->m_alignContent.position(); }
+    ContentDistributionType alignContentDistribution() const { return m_rareNonInheritedData->m_alignContent.distribution(); }
+    OverflowAlignment alignContentOverflowAlignment() const { return m_rareNonInheritedData->m_alignContent.overflow(); }
+    const StyleSelfAlignmentData& alignItems() const { return m_rareNonInheritedData->m_alignItems; }
+    ItemPosition alignItemsPosition() const { return m_rareNonInheritedData->m_alignItems.position(); }
+    OverflowAlignment alignItemsOverflowAlignment() const { return m_rareNonInheritedData->m_alignItems.overflow(); }
+    const StyleSelfAlignmentData& alignSelf() const { return m_rareNonInheritedData->m_alignSelf; }
+    ItemPosition alignSelfPosition() const { return m_rareNonInheritedData->m_alignSelf.position(); }
+    OverflowAlignment alignSelfOverflowAlignment() const { return m_rareNonInheritedData->m_alignSelf.overflow(); }
+    EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(m_rareNonInheritedData->m_flexibleBox->m_flexDirection); }
     bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; }
     bool isReverseFlexDirection() const { return flexDirection() == FlowRowReverse || flexDirection() == FlowColumnReverse; }
-    EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedData->m_flexibleBox->m_flexWrap); }
-    const StyleContentAlignmentData& justifyContent() const { return rareNonInheritedData->m_justifyContent; }
-    ContentPosition justifyContentPosition() const { return rareNonInheritedData->m_justifyContent.position(); }
-    ContentDistributionType justifyContentDistribution() const { return rareNonInheritedData->m_justifyContent.distribution(); }
-    OverflowAlignment justifyContentOverflowAlignment() const { return rareNonInheritedData->m_justifyContent.overflow(); }
-    const StyleSelfAlignmentData& justifyItems() const { return rareNonInheritedData->m_justifyItems; }
-    ItemPosition justifyItemsPosition() const { return rareNonInheritedData->m_justifyItems.position(); }
-    OverflowAlignment justifyItemsOverflowAlignment() const { return rareNonInheritedData->m_justifyItems.overflow(); }
-    ItemPositionType justifyItemsPositionType() const { return rareNonInheritedData->m_justifyItems.positionType(); }
-    const StyleSelfAlignmentData& justifySelf() const { return rareNonInheritedData->m_justifySelf; }
-    ItemPosition justifySelfPosition() const { return rareNonInheritedData->m_justifySelf.position(); }
-    OverflowAlignment justifySelfOverflowAlignment() const { return rareNonInheritedData->m_justifySelf.overflow(); }
+    EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(m_rareNonInheritedData->m_flexibleBox->m_flexWrap); }
+    const StyleContentAlignmentData& justifyContent() const { return m_rareNonInheritedData->m_justifyContent; }
+    ContentPosition justifyContentPosition() const { return m_rareNonInheritedData->m_justifyContent.position(); }
+    ContentDistributionType justifyContentDistribution() const { return m_rareNonInheritedData->m_justifyContent.distribution(); }
+    OverflowAlignment justifyContentOverflowAlignment() const { return m_rareNonInheritedData->m_justifyContent.overflow(); }
+    const StyleSelfAlignmentData& justifyItems() const { return m_rareNonInheritedData->m_justifyItems; }
+    ItemPosition justifyItemsPosition() const { return m_rareNonInheritedData->m_justifyItems.position(); }
+    OverflowAlignment justifyItemsOverflowAlignment() const { return m_rareNonInheritedData->m_justifyItems.overflow(); }
+    ItemPositionType justifyItemsPositionType() const { return m_rareNonInheritedData->m_justifyItems.positionType(); }
+    const StyleSelfAlignmentData& justifySelf() const { return m_rareNonInheritedData->m_justifySelf; }
+    ItemPosition justifySelfPosition() const { return m_rareNonInheritedData->m_justifySelf.position(); }
+    OverflowAlignment justifySelfOverflowAlignment() const { return m_rareNonInheritedData->m_justifySelf.overflow(); }
 
-    const Vector<GridTrackSize>& gridTemplateColumns() const { return rareNonInheritedData->m_grid->m_gridTemplateColumns; }
-    const Vector<GridTrackSize>& gridTemplateRows() const { return rareNonInheritedData->m_grid->m_gridTemplateRows; }
-    const Vector<GridTrackSize>& gridAutoRepeatColumns() const { return rareNonInheritedData->m_grid->m_gridAutoRepeatColumns; }
-    const Vector<GridTrackSize>& gridAutoRepeatRows() const { return rareNonInheritedData->m_grid->m_gridAutoRepeatRows; }
-    size_t gridAutoRepeatColumnsInsertionPoint() const { return rareNonInheritedData->m_grid->m_autoRepeatColumnsInsertionPoint; }
-    size_t gridAutoRepeatRowsInsertionPoint() const { return rareNonInheritedData->m_grid->m_autoRepeatRowsInsertionPoint; }
-    AutoRepeatType gridAutoRepeatColumnsType() const  { return rareNonInheritedData->m_grid->m_autoRepeatColumnsType; }
-    AutoRepeatType gridAutoRepeatRowsType() const  { return rareNonInheritedData->m_grid->m_autoRepeatRowsType; }
-    const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheritedData->m_grid->m_namedGridColumnLines; }
-    const NamedGridLinesMap& namedGridRowLines() const { return rareNonInheritedData->m_grid->m_namedGridRowLines; }
-    const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return rareNonInheritedData->m_grid->m_orderedNamedGridColumnLines; }
-    const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareNonInheritedData->m_grid->m_orderedNamedGridRowLines; }
-    const NamedGridLinesMap& autoRepeatNamedGridColumnLines() const { return rareNonInheritedData->m_grid->m_autoRepeatNamedGridColumnLines; }
-    const NamedGridLinesMap& autoRepeatNamedGridRowLines() const { return rareNonInheritedData->m_grid->m_autoRepeatNamedGridRowLines; }
-    const OrderedNamedGridLines& autoRepeatOrderedNamedGridColumnLines() const { return rareNonInheritedData->m_grid->m_autoRepeatOrderedNamedGridColumnLines; }
-    const OrderedNamedGridLines& autoRepeatOrderedNamedGridRowLines() const { return rareNonInheritedData->m_grid->m_autoRepeatOrderedNamedGridRowLines; }
-    const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData->m_grid->m_namedGridArea; }
-    size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid->m_namedGridAreaRowCount; }
-    size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_grid->m_namedGridAreaColumnCount; }
-    GridAutoFlow getGridAutoFlow() const { return static_cast<GridAutoFlow>(rareNonInheritedData->m_grid->m_gridAutoFlow); }
-    bool isGridAutoFlowDirectionRow() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowDirectionRow) == InternalAutoFlowDirectionRow; }
-    bool isGridAutoFlowDirectionColumn() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowDirectionColumn) == InternalAutoFlowDirectionColumn; }
-    bool isGridAutoFlowAlgorithmSparse() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowAlgorithmSparse) == InternalAutoFlowAlgorithmSparse; }
-    bool isGridAutoFlowAlgorithmDense() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowAlgorithmDense) == InternalAutoFlowAlgorithmDense; }
-    const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData->m_grid->m_gridAutoColumns; }
-    const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_grid->m_gridAutoRows; }
-    const Length& gridColumnGap() const { return rareNonInheritedData->m_grid->m_gridColumnGap; }
-    const Length& gridRowGap() const { return rareNonInheritedData->m_grid->m_gridRowGap; }
+    const Vector<GridTrackSize>& gridTemplateColumns() const { return m_rareNonInheritedData->m_grid->m_gridTemplateColumns; }
+    const Vector<GridTrackSize>& gridTemplateRows() const { return m_rareNonInheritedData->m_grid->m_gridTemplateRows; }
+    const Vector<GridTrackSize>& gridAutoRepeatColumns() const { return m_rareNonInheritedData->m_grid->m_gridAutoRepeatColumns; }
+    const Vector<GridTrackSize>& gridAutoRepeatRows() const { return m_rareNonInheritedData->m_grid->m_gridAutoRepeatRows; }
+    size_t gridAutoRepeatColumnsInsertionPoint() const { return m_rareNonInheritedData->m_grid->m_autoRepeatColumnsInsertionPoint; }
+    size_t gridAutoRepeatRowsInsertionPoint() const { return m_rareNonInheritedData->m_grid->m_autoRepeatRowsInsertionPoint; }
+    AutoRepeatType gridAutoRepeatColumnsType() const  { return m_rareNonInheritedData->m_grid->m_autoRepeatColumnsType; }
+    AutoRepeatType gridAutoRepeatRowsType() const  { return m_rareNonInheritedData->m_grid->m_autoRepeatRowsType; }
+    const NamedGridLinesMap& namedGridColumnLines() const { return m_rareNonInheritedData->m_grid->m_namedGridColumnLines; }
+    const NamedGridLinesMap& namedGridRowLines() const { return m_rareNonInheritedData->m_grid->m_namedGridRowLines; }
+    const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return m_rareNonInheritedData->m_grid->m_orderedNamedGridColumnLines; }
+    const OrderedNamedGridLines& orderedNamedGridRowLines() const { return m_rareNonInheritedData->m_grid->m_orderedNamedGridRowLines; }
+    const NamedGridLinesMap& autoRepeatNamedGridColumnLines() const { return m_rareNonInheritedData->m_grid->m_autoRepeatNamedGridColumnLines; }
+    const NamedGridLinesMap& autoRepeatNamedGridRowLines() const { return m_rareNonInheritedData->m_grid->m_autoRepeatNamedGridRowLines; }
+    const OrderedNamedGridLines& autoRepeatOrderedNamedGridColumnLines() const { return m_rareNonInheritedData->m_grid->m_autoRepeatOrderedNamedGridColumnLines; }
+    const OrderedNamedGridLines& autoRepeatOrderedNamedGridRowLines() const { return m_rareNonInheritedData->m_grid->m_autoRepeatOrderedNamedGridRowLines; }
+    const NamedGridAreaMap& namedGridArea() const { return m_rareNonInheritedData->m_grid->m_namedGridArea; }
+    size_t namedGridAreaRowCount() const { return m_rareNonInheritedData->m_grid->m_namedGridAreaRowCount; }
+    size_t namedGridAreaColumnCount() const { return m_rareNonInheritedData->m_grid->m_namedGridAreaColumnCount; }
+    GridAutoFlow getGridAutoFlow() const { return static_cast<GridAutoFlow>(m_rareNonInheritedData->m_grid->m_gridAutoFlow); }
+    bool isGridAutoFlowDirectionRow() const { return (m_rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowDirectionRow) == InternalAutoFlowDirectionRow; }
+    bool isGridAutoFlowDirectionColumn() const { return (m_rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowDirectionColumn) == InternalAutoFlowDirectionColumn; }
+    bool isGridAutoFlowAlgorithmSparse() const { return (m_rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowAlgorithmSparse) == InternalAutoFlowAlgorithmSparse; }
+    bool isGridAutoFlowAlgorithmDense() const { return (m_rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowAlgorithmDense) == InternalAutoFlowAlgorithmDense; }
+    const GridTrackSize& gridAutoColumns() const { return m_rareNonInheritedData->m_grid->m_gridAutoColumns; }
+    const GridTrackSize& gridAutoRows() const { return m_rareNonInheritedData->m_grid->m_gridAutoRows; }
+    const Length& gridColumnGap() const { return m_rareNonInheritedData->m_grid->m_gridColumnGap; }
+    const Length& gridRowGap() const { return m_rareNonInheritedData->m_grid->m_gridRowGap; }
 
-    const GridPosition& gridColumnStart() const { return rareNonInheritedData->m_gridItem->m_gridColumnStart; }
-    const GridPosition& gridColumnEnd() const { return rareNonInheritedData->m_gridItem->m_gridColumnEnd; }
-    const GridPosition& gridRowStart() const { return rareNonInheritedData->m_gridItem->m_gridRowStart; }
-    const GridPosition& gridRowEnd() const { return rareNonInheritedData->m_gridItem->m_gridRowEnd; }
+    const GridPosition& gridColumnStart() const { return m_rareNonInheritedData->m_gridItem->m_gridColumnStart; }
+    const GridPosition& gridColumnEnd() const { return m_rareNonInheritedData->m_gridItem->m_gridColumnEnd; }
+    const GridPosition& gridRowStart() const { return m_rareNonInheritedData->m_gridItem->m_gridRowStart; }
+    const GridPosition& gridRowEnd() const { return m_rareNonInheritedData->m_gridItem->m_gridRowEnd; }
 
-    ShadowList* boxShadow() const { return rareNonInheritedData->m_boxShadow.get(); }
+    ShadowList* boxShadow() const { return m_rareNonInheritedData->m_boxShadow.get(); }
 
     EBoxDecorationBreak boxDecorationBreak() const { return m_box->boxDecorationBreak(); }
-    StyleReflection* boxReflect() const { return rareNonInheritedData->m_boxReflect.get(); }
+    StyleReflection* boxReflect() const { return m_rareNonInheritedData->m_boxReflect.get(); }
     bool hasBoxReflect() const { return boxReflect(); }
-    bool reflectionDataEquivalent(const ComputedStyle* otherStyle) const { return rareNonInheritedData->reflectionDataEquivalent(*otherStyle->rareNonInheritedData); }
+    bool reflectionDataEquivalent(const ComputedStyle* otherStyle) const { return m_rareNonInheritedData->reflectionDataEquivalent(*otherStyle->m_rareNonInheritedData); }
 
     // FIXME: reflections should belong to this helper function but they are currently handled
     // through their self-painting layers. So the layout code doesn't account for them.
     bool hasVisualOverflowingEffect() const { return boxShadow() || hasBorderImageOutsets() || hasOutline(); }
 
-    Containment contain() const { return static_cast<Containment>(rareNonInheritedData->m_contain); }
-    bool containsPaint() const { return rareNonInheritedData->m_contain & ContainsPaint; }
-    bool containsStyle() const { return rareNonInheritedData->m_contain & ContainsStyle; }
-    bool containsLayout() const { return rareNonInheritedData->m_contain & ContainsLayout; }
-    bool containsSize() const { return rareNonInheritedData->m_contain & ContainsSize; }
+    Containment contain() const { return static_cast<Containment>(m_rareNonInheritedData->m_contain); }
+    bool containsPaint() const { return m_rareNonInheritedData->m_contain & ContainsPaint; }
+    bool containsStyle() const { return m_rareNonInheritedData->m_contain & ContainsStyle; }
+    bool containsLayout() const { return m_rareNonInheritedData->m_contain & ContainsLayout; }
+    bool containsSize() const { return m_rareNonInheritedData->m_contain & ContainsSize; }
 
     EBoxSizing boxSizing() const { return m_box->boxSizing(); }
-    EUserModify userModify() const { return static_cast<EUserModify>(rareInheritedData->userModify); }
-    EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedData->userDrag); }
-    EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInheritedData->userSelect); }
-    TextOverflow getTextOverflow() const { return static_cast<TextOverflow>(rareNonInheritedData->textOverflow); }
-    EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCollapse>(rareNonInheritedData->marginBeforeCollapse); }
-    EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginCollapse>(rareNonInheritedData->marginAfterCollapse); }
-    EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedData->wordBreak); }
-    EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareInheritedData->overflowWrap); }
-    LineBreak getLineBreak() const { return static_cast<LineBreak>(rareInheritedData->lineBreak); }
-    const AtomicString& highlight() const { return rareInheritedData->highlight; }
-    Hyphens getHyphens() const { return static_cast<Hyphens>(rareInheritedData->hyphens); }
-    const AtomicString& hyphenationString() const { return rareInheritedData->hyphenationString; }
+    EUserModify userModify() const { return static_cast<EUserModify>(m_rareInheritedData->userModify); }
+    EUserDrag userDrag() const { return static_cast<EUserDrag>(m_rareNonInheritedData->userDrag); }
+    EUserSelect userSelect() const { return static_cast<EUserSelect>(m_rareInheritedData->userSelect); }
+    TextOverflow getTextOverflow() const { return static_cast<TextOverflow>(m_rareNonInheritedData->textOverflow); }
+    EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCollapse>(m_rareNonInheritedData->marginBeforeCollapse); }
+    EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginCollapse>(m_rareNonInheritedData->marginAfterCollapse); }
+    EWordBreak wordBreak() const { return static_cast<EWordBreak>(m_rareInheritedData->wordBreak); }
+    EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(m_rareInheritedData->overflowWrap); }
+    LineBreak getLineBreak() const { return static_cast<LineBreak>(m_rareInheritedData->lineBreak); }
+    const AtomicString& highlight() const { return m_rareInheritedData->highlight; }
+    Hyphens getHyphens() const { return static_cast<Hyphens>(m_rareInheritedData->hyphens); }
+    const AtomicString& hyphenationString() const { return m_rareInheritedData->hyphenationString; }
     const AtomicString& locale() const { return getFontDescription().locale(false); }
-    EResize resize() const { return static_cast<EResize>(rareNonInheritedData->m_resize); }
+    EResize resize() const { return static_cast<EResize>(m_rareNonInheritedData->m_resize); }
     bool hasInlinePaginationAxis() const
     {
         // If the pagination axis is parallel with the writing mode inline axis, columns may be laid
         // out along the inline axis, just like for regular multicol. Otherwise, we need to lay out
         // along the block axis.
         if (isOverflowPaged())
             return (overflowY() == OverflowPagedX) == isHorizontalWritingMode();
         return false;
     }
-    float columnWidth() const { return rareNonInheritedData->m_multiCol->m_width; }
-    bool hasAutoColumnWidth() const { return rareNonInheritedData->m_multiCol->m_autoWidth; }
-    unsigned short columnCount() const { return rareNonInheritedData->m_multiCol->m_count; }
-    bool hasAutoColumnCount() const { return rareNonInheritedData->m_multiCol->m_autoCount; }
+    float columnWidth() const { return m_rareNonInheritedData->m_multiCol->m_width; }
+    bool hasAutoColumnWidth() const { return m_rareNonInheritedData->m_multiCol->m_autoWidth; }
+    unsigned short columnCount() const { return m_rareNonInheritedData->m_multiCol->m_count; }
+    bool hasAutoColumnCount() const { return m_rareNonInheritedData->m_multiCol->m_autoCount; }
     bool specifiesColumns() const { return !hasAutoColumnCount() || !hasAutoColumnWidth(); }
-    ColumnFill getColumnFill() const { return static_cast<ColumnFill>(rareNonInheritedData->m_multiCol->m_fill); }
-    float columnGap() const { return rareNonInheritedData->m_multiCol->m_gap; }
-    bool hasNormalColumnGap() const { return rareNonInheritedData->m_multiCol->m_normalGap; }
-    EBorderStyle columnRuleStyle() const { return rareNonInheritedData->m_multiCol->m_rule.style(); }
-    unsigned short columnRuleWidth() const { return rareNonInheritedData->m_multiCol->ruleWidth(); }
-    bool columnRuleIsTransparent() const { return rareNonInheritedData->m_multiCol->m_rule.isTransparent(); }
+    ColumnFill getColumnFill() const { return static_cast<ColumnFill>(m_rareNonInheritedData->m_multiCol->m_fill); }
+    float columnGap() const { return m_rareNonInheritedData->m_multiCol->m_gap; }
+    bool hasNormalColumnGap() const { return m_rareNonInheritedData->m_multiCol->m_normalGap; }
+    EBorderStyle columnRuleStyle() const { return m_rareNonInheritedData->m_multiCol->m_rule.style(); }
+    unsigned short columnRuleWidth() const { return m_rareNonInheritedData->m_multiCol->ruleWidth(); }
+    bool columnRuleIsTransparent() const { return m_rareNonInheritedData->m_multiCol->m_rule.isTransparent(); }
     bool columnRuleEquivalent(const ComputedStyle* otherStyle) const;
-    ColumnSpan getColumnSpan() const { return static_cast<ColumnSpan>(rareNonInheritedData->m_multiCol->m_columnSpan); }
-    bool hasInlineTransform() const { return rareNonInheritedData->m_hasInlineTransform; }
-    bool hasCompositorProxy() const { return rareNonInheritedData->m_hasCompositorProxy; }
-    const TransformOperations& transform() const { return rareNonInheritedData->m_transform->m_operations; }
-    const TransformOrigin& transformOrigin() const { return rareNonInheritedData->m_transform->m_origin; }
+    ColumnSpan getColumnSpan() const { return static_cast<ColumnSpan>(m_rareNonInheritedData->m_multiCol->m_columnSpan); }
+    bool hasInlineTransform() const { return m_rareNonInheritedData->m_hasInlineTransform; }
+    bool hasCompositorProxy() const { return m_rareNonInheritedData->m_hasCompositorProxy; }
+    const TransformOperations& transform() const { return m_rareNonInheritedData->m_transform->m_operations; }
+    const TransformOrigin& transformOrigin() const { return m_rareNonInheritedData->m_transform->m_origin; }
     const Length& transformOriginX() const { return transformOrigin().x(); }
     const Length& transformOriginY() const { return transformOrigin().y(); }
-    TranslateTransformOperation* translate() const { return rareNonInheritedData->m_transform->m_translate.get(); }
-    RotateTransformOperation* rotate() const { return rareNonInheritedData->m_transform->m_rotate.get(); }
-    ScaleTransformOperation* scale() const { return rareNonInheritedData->m_transform->m_scale.get(); }
+    TranslateTransformOperation* translate() const { return m_rareNonInheritedData->m_transform->m_translate.get(); }
+    RotateTransformOperation* rotate() const { return m_rareNonInheritedData->m_transform->m_rotate.get(); }
+    ScaleTransformOperation* scale() const { return m_rareNonInheritedData->m_transform->m_scale.get(); }
     float transformOriginZ() const { return transformOrigin().z(); }
-    bool has3DTransform() const { return rareNonInheritedData->m_transform->has3DTransform(); }
+    bool has3DTransform() const { return m_rareNonInheritedData->m_transform->has3DTransform(); }
     bool hasTransform() const { return hasTransformOperations() || hasMotionPath() || hasCurrentTransformAnimation() || translate() || rotate() || scale(); }
-    bool hasTransformOperations() const { return !rareNonInheritedData->m_transform->m_operations.operations().isEmpty(); }
-    bool transformDataEquivalent(const ComputedStyle& otherStyle) const { return rareNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transform; }
+    bool hasTransformOperations() const { return !m_rareNonInheritedData->m_transform->m_operations.operations().isEmpty(); }
+    bool transformDataEquivalent(const ComputedStyle& otherStyle) const { return m_rareNonInheritedData->m_transform == otherStyle.m_rareNonInheritedData->m_transform; }
 
-    StylePath* motionPath() const { return rareNonInheritedData->m_transform->m_motion.m_path.get(); }
+    StylePath* motionPath() const { return m_rareNonInheritedData->m_transform->m_motion.m_path.get(); }
     bool hasMotionPath() const { return motionPath(); }
-    const Length& motionOffset() const { return rareNonInheritedData->m_transform->m_motion.m_offset; }
-    const StyleMotionRotation& motionRotation() const { return rareNonInheritedData->m_transform->m_motion.m_rotation; }
+    const Length& motionOffset() const { return m_rareNonInheritedData->m_transform->m_motion.m_offset; }
+    const StyleMotionRotation& motionRotation() const { return m_rareNonInheritedData->m_transform->m_motion.m_rotation; }
 
-    TextEmphasisFill getTextEmphasisFill() const { return static_cast<TextEmphasisFill>(rareInheritedData->textEmphasisFill); }
+    TextEmphasisFill getTextEmphasisFill() const { return static_cast<TextEmphasisFill>(m_rareInheritedData->textEmphasisFill); }
     TextEmphasisMark getTextEmphasisMark() const;
-    const AtomicString& textEmphasisCustomMark() const { return rareInheritedData->textEmphasisCustomMark; }
-    TextEmphasisPosition getTextEmphasisPosition() const { return static_cast<TextEmphasisPosition>(rareInheritedData->textEmphasisPosition); }
+    const AtomicString& textEmphasisCustomMark() const { return m_rareInheritedData->textEmphasisCustomMark; }
+    TextEmphasisPosition getTextEmphasisPosition() const { return static_cast<TextEmphasisPosition>(m_rareInheritedData->textEmphasisPosition); }
     const AtomicString& textEmphasisMarkString() const;
 
-    RubyPosition getRubyPosition() const { return static_cast<RubyPosition>(rareInheritedData->m_rubyPosition); }
+    RubyPosition getRubyPosition() const { return static_cast<RubyPosition>(m_rareInheritedData->m_rubyPosition); }
 
-    TextOrientation getTextOrientation() const { return static_cast<TextOrientation>(rareInheritedData->m_textOrientation); }
+    TextOrientation getTextOrientation() const { return static_cast<TextOrientation>(m_rareInheritedData->m_textOrientation); }
 
-    ObjectFit getObjectFit() const { return static_cast<ObjectFit>(rareNonInheritedData->m_objectFit); }
-    LengthPoint objectPosition() const { return rareNonInheritedData->m_objectPosition; }
+    ObjectFit getObjectFit() const { return static_cast<ObjectFit>(m_rareNonInheritedData->m_objectFit); }
+    LengthPoint objectPosition() const { return m_rareNonInheritedData->m_objectPosition; }
 
     // Return true if any transform related property (currently transform/motionPath, transformStyle3D, perspective,
     // or will-change:transform) indicates that we are transforming. will-change:transform should result in
     // the same rendering behavior as having a transform, including the creation of a containing block
     // for fixed position descendants.
     bool hasTransformRelatedProperty() const { return hasTransform() || preserves3D() || hasPerspective() || hasWillChangeTransformHint(); }
 
     enum ApplyTransformOrigin { IncludeTransformOrigin, ExcludeTransformOrigin };
     enum ApplyMotionPath { IncludeMotionPath, ExcludeMotionPath };
     enum ApplyIndependentTransformProperties { IncludeIndependentTransformProperties , ExcludeIndependentTransformProperties };
     void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin, ApplyMotionPath, ApplyIndependentTransformProperties) const;
     void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, ApplyTransformOrigin, ApplyMotionPath, ApplyIndependentTransformProperties) const;
-    bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rareNonInheritedData->m_maskBoxImage.hasImage(); }
+    bool hasMask() const { return m_rareNonInheritedData->m_mask.hasImage() || m_rareNonInheritedData->m_maskBoxImage.hasImage(); }
 
-    TextCombine getTextCombine() const { return static_cast<TextCombine>(rareInheritedData->m_textCombine); }
+    TextCombine getTextCombine() const { return static_cast<TextCombine>(m_rareInheritedData->m_textCombine); }
     bool hasTextCombine() const { return getTextCombine() != TextCombineNone; }
 
-    uint8_t snapHeightPosition() const { return rareInheritedData->m_snapHeightPosition; }
-    uint8_t snapHeightUnit() const { return rareInheritedData->m_snapHeightUnit; }
+    uint8_t snapHeightPosition() const { return m_rareInheritedData->m_snapHeightPosition; }
+    uint8_t snapHeightUnit() const { return m_rareInheritedData->m_snapHeightUnit; }
 
-    TabSize getTabSize() const { return rareInheritedData->m_tabSize; }
+    TabSize getTabSize() const { return m_rareInheritedData->m_tabSize; }
 
-    RespectImageOrientationEnum respectImageOrientation() const { return static_cast<RespectImageOrientationEnum>(rareInheritedData->m_respectImageOrientation); }
+    RespectImageOrientationEnum respectImageOrientation() const { return static_cast<RespectImageOrientationEnum>(m_rareInheritedData->m_respectImageOrientation); }
 
     // End CSS3 Getters
 
     // Apple-specific property getter methods
-    EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(inherited_data.m_pointerEvents); }
-    const CSSAnimationData* animations() const { return rareNonInheritedData->m_animations.get(); }
-    const CSSTransitionData* transitions() const { return rareNonInheritedData->m_transitions.get(); }
+    EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(m_inheritedData.m_pointerEvents); }
+    const CSSAnimationData* animations() const { return m_rareNonInheritedData->m_animations.get(); }
+    const CSSTransitionData* transitions() const { return m_rareNonInheritedData->m_transitions.get(); }
 
     CSSAnimationData& accessAnimations();
     CSSTransitionData& accessTransitions();
 
-    ETransformStyle3D transformStyle3D() const { return static_cast<ETransformStyle3D>(rareNonInheritedData->m_transformStyle3D); }
+    ETransformStyle3D transformStyle3D() const { return static_cast<ETransformStyle3D>(m_rareNonInheritedData->m_transformStyle3D); }
     ETransformStyle3D usedTransformStyle3D() const { return hasGroupingProperty() ? TransformStyle3DFlat : transformStyle3D(); }
     bool preserves3D() const { return usedTransformStyle3D() != TransformStyle3DFlat; }
 
-    EBackfaceVisibility backfaceVisibility() const { return static_cast<EBackfaceVisibility>(rareNonInheritedData->m_backfaceVisibility); }
-    float perspective() const { return rareNonInheritedData->m_perspective; }
-    bool hasPerspective() const { return rareNonInheritedData->m_perspective > 0; }
-    const LengthPoint& perspectiveOrigin() const { return rareNonInheritedData->m_perspectiveOrigin; }
+    EBackfaceVisibility backfaceVisibility() const { return static_cast<EBackfaceVisibility>(m_rareNonInheritedData->m_backfaceVisibility); }
+    float perspective() const { return m_rareNonInheritedData->m_perspective; }
+    bool hasPerspective() const { return m_rareNonInheritedData->m_perspective > 0; }
+    const LengthPoint& perspectiveOrigin() const { return m_rareNonInheritedData->m_perspectiveOrigin; }
     const Length& perspectiveOriginX() const { return perspectiveOrigin().x(); }
     const Length& perspectiveOriginY() const { return perspectiveOrigin().y(); }
-    const FloatSize& pageSize() const { return rareNonInheritedData->m_pageSize; }
-    PageSizeType getPageSizeType() const { return static_cast<PageSizeType>(rareNonInheritedData->m_pageSizeType); }
+    const FloatSize& pageSize() const { return m_rareNonInheritedData->m_pageSize; }
+    PageSizeType getPageSizeType() const { return static_cast<PageSizeType>(m_rareNonInheritedData->m_pageSizeType); }
 
-    bool hasCurrentOpacityAnimation() const { return rareNonInheritedData->m_hasCurrentOpacityAnimation; }
-    bool hasCurrentTransformAnimation() const { return rareNonInheritedData->m_hasCurrentTransformAnimation; }
-    bool hasCurrentFilterAnimation() const { return rareNonInheritedData->m_hasCurrentFilterAnimation; }
-    bool hasCurrentBackdropFilterAnimation() const { return rareNonInheritedData->m_hasCurrentBackdropFilterAnimation; }
+    bool hasCurrentOpacityAnimation() const { return m_rareNonInheritedData->m_hasCurrentOpacityAnimation; }
+    bool hasCurrentTransformAnimation() const { return m_rareNonInheritedData->m_hasCurrentTransformAnimation; }
+    bool hasCurrentFilterAnimation() const { return m_rareNonInheritedData->m_hasCurrentFilterAnimation; }
+    bool hasCurrentBackdropFilterAnimation() const { return m_rareNonInheritedData->m_hasCurrentBackdropFilterAnimation; }
     bool shouldCompositeForCurrentAnimations() const { return hasCurrentOpacityAnimation() || hasCurrentTransformAnimation() || hasCurrentFilterAnimation() || hasCurrentBackdropFilterAnimation(); }
 
-    bool isRunningOpacityAnimationOnCompositor() const { return rareNonInheritedData->m_runningOpacityAnimationOnCompositor; }
-    bool isRunningTransformAnimationOnCompositor() const { return rareNonInheritedData->m_runningTransformAnimationOnCompositor; }
-    bool isRunningFilterAnimationOnCompositor() const { return rareNonInheritedData->m_runningFilterAnimationOnCompositor; }
-    bool isRunningBackdropFilterAnimationOnCompositor() const { return rareNonInheritedData->m_runningBackdropFilterAnimationOnCompositor; }
+    bool isRunningOpacityAnimationOnCompositor() const { return m_rareNonInheritedData->m_runningOpacityAnimationOnCompositor; }
+    bool isRunningTransformAnimationOnCompositor() const { return m_rareNonInheritedData->m_runningTransformAnimationOnCompositor; }
+    bool isRunningFilterAnimationOnCompositor() const { return m_rareNonInheritedData->m_runningFilterAnimationOnCompositor; }
+    bool isRunningBackdropFilterAnimationOnCompositor() const { return m_rareNonInheritedData->m_runningBackdropFilterAnimationOnCompositor; }
     bool isRunningAnimationOnCompositor() const { return isRunningOpacityAnimationOnCompositor() || isRunningTransformAnimationOnCompositor() || isRunningFilterAnimationOnCompositor() || isRunningBackdropFilterAnimationOnCompositor(); }
 
-    const LineClampValue& lineClamp() const { return rareNonInheritedData->lineClamp; }
-    Color tapHighlightColor() const { return rareInheritedData->tapHighlightColor; }
-    ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareInheritedData->textSecurity); }
+    const LineClampValue& lineClamp() const { return m_rareNonInheritedData->lineClamp; }
+    Color tapHighlightColor() const { return m_rareInheritedData->tapHighlightColor; }
+    ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(m_rareInheritedData->textSecurity); }
 
-    WritingMode getWritingMode() const { return static_cast<WritingMode>(inherited_data.m_writingMode); }
+    WritingMode getWritingMode() const { return static_cast<WritingMode>(m_inheritedData.m_writingMode); }
     bool isHorizontalWritingMode() const { return blink::isHorizontalWritingMode(getWritingMode()); }
     bool isFlippedLinesWritingMode() const { return blink::isFlippedLinesWritingMode(getWritingMode()); }
     bool isFlippedBlocksWritingMode() const { return blink::isFlippedBlocksWritingMode(getWritingMode()); }
 
-    EImageRendering imageRendering() const { return static_cast<EImageRendering>(rareInheritedData->m_imageRendering); }
+    EImageRendering imageRendering() const { return static_cast<EImageRendering>(m_rareInheritedData->m_imageRendering); }
 
-    ESpeak speak() const { return static_cast<ESpeak>(rareInheritedData->speak); }
+    ESpeak speak() const { return static_cast<ESpeak>(m_rareInheritedData->speak); }
 
-    FilterOperations& mutableFilter() { return rareNonInheritedData.access()->m_filter.access()->m_operations; }
-    const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; }
-    bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); }
+    FilterOperations& mutableFilter() { return m_rareNonInheritedData.access()->m_filter.access()->m_operations; }
+    const FilterOperations& filter() const { return m_rareNonInheritedData->m_filter->m_operations; }
+    bool hasFilter() const { return !m_rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); }
 
-    FilterOperations& mutableBackdropFilter() { return rareNonInheritedData.access()->m_backdropFilter.access()->m_operations; }
-    const FilterOperations& backdropFilter() const { return rareNonInheritedData->m_backdropFilter->m_operations; }
-    bool hasBackdropFilter() const { return !rareNonInheritedData->m_backdropFilter->m_operations.operations().isEmpty(); }
+    FilterOperations& mutableBackdropFilter() { return m_rareNonInheritedData.access()->m_backdropFilter.access()->m_operations; }
+    const FilterOperations& backdropFilter() const { return m_rareNonInheritedData->m_backdropFilter->m_operations; }
+    bool hasBackdropFilter() const { return !m_rareNonInheritedData->m_backdropFilter->m_operations.operations().isEmpty(); }
 
-    WebBlendMode blendMode() const { return static_cast<WebBlendMode>(rareNonInheritedData->m_effectiveBlendMode); }
-    void setBlendMode(WebBlendMode v) { rareNonInheritedData.access()->m_effectiveBlendMode = v; }
+    WebBlendMode blendMode() const { return static_cast<WebBlendMode>(m_rareNonInheritedData->m_effectiveBlendMode); }
+    void setBlendMode(WebBlendMode v) { m_rareNonInheritedData.access()->m_effectiveBlendMode = v; }
     bool hasBlendMode() const { return blendMode() != WebBlendModeNormal; }
 
-    EIsolation isolation() const { return static_cast<EIsolation>(rareNonInheritedData->m_isolation); }
-    void setIsolation(EIsolation v) { rareNonInheritedData.access()->m_isolation = v; }
+    EIsolation isolation() const { return static_cast<EIsolation>(m_rareNonInheritedData->m_isolation); }
+    void setIsolation(EIsolation v) { m_rareNonInheritedData.access()->m_isolation = v; }
     bool hasIsolation() const { return isolation() != IsolationAuto; }
 
     bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLeftToRightDirection() && isHorizontalWritingMode(); }
 
-    TouchAction getTouchAction() const { return static_cast<TouchAction>(rareNonInheritedData->m_touchAction); }
+    TouchAction getTouchAction() const { return static_cast<TouchAction>(m_rareNonInheritedData->m_touchAction); }
 
-    ScrollBehavior getScrollBehavior() const { return static_cast<ScrollBehavior>(rareNonInheritedData->m_scrollBehavior); }
+    ScrollBehavior getScrollBehavior() const { return static_cast<ScrollBehavior>(m_rareNonInheritedData->m_scrollBehavior); }
 
-    ScrollSnapType getScrollSnapType() const { return static_cast<ScrollSnapType>(rareNonInheritedData->m_scrollSnapType); }
-    const ScrollSnapPoints& scrollSnapPointsX() const { return rareNonInheritedData->m_scrollSnap->m_xPoints; }
-    const ScrollSnapPoints& scrollSnapPointsY() const { return rareNonInheritedData->m_scrollSnap->m_yPoints; }
-    const Vector<LengthPoint>& scrollSnapCoordinate() const { return rareNonInheritedData->m_scrollSnap->m_coordinates; }
-    const LengthPoint& scrollSnapDestination() const { return rareNonInheritedData->m_scrollSnap->m_destination; }
+    ScrollSnapType getScrollSnapType() const { return static_cast<ScrollSnapType>(m_rareNonInheritedData->m_scrollSnapType); }
+    const ScrollSnapPoints& scrollSnapPointsX() const { return m_rareNonInheritedData->m_scrollSnap->m_xPoints; }
+    const ScrollSnapPoints& scrollSnapPointsY() const { return m_rareNonInheritedData->m_scrollSnap->m_yPoints; }
+    const Vector<LengthPoint>& scrollSnapCoordinate() const { return m_rareNonInheritedData->m_scrollSnap->m_coordinates; }
+    const LengthPoint& scrollSnapDestination() const { return m_rareNonInheritedData->m_scrollSnap->m_destination; }
 
-    const Vector<CSSPropertyID>& willChangeProperties() const { return rareNonInheritedData->m_willChange->m_properties; }
-    bool willChangeContents() const { return rareNonInheritedData->m_willChange->m_contents; }
-    bool willChangeScrollPosition() const { return rareNonInheritedData->m_willChange->m_scrollPosition; }
+    const Vector<CSSPropertyID>& willChangeProperties() const { return m_rareNonInheritedData->m_willChange->m_properties; }
+    bool willChangeContents() const { return m_rareNonInheritedData->m_willChange->m_contents; }
+    bool willChangeScrollPosition() const { return m_rareNonInheritedData->m_willChange->m_scrollPosition; }
     bool hasWillChangeCompositingHint() const;
     bool hasWillChangeOpacityHint() const { return willChangeProperties().contains(CSSPropertyOpacity); }
     bool hasWillChangeTransformHint() const;
-    bool subtreeWillChangeContents() const { return rareInheritedData->m_subtreeWillChangeContents; }
+    bool subtreeWillChangeContents() const { return m_rareInheritedData->m_subtreeWillChangeContents; }
 
 // attribute setter methods
 
-    void setDisplay(EDisplay v) { noninherited_data.m_effectiveDisplay = v; }
-    void setOriginalDisplay(EDisplay v) { noninherited_data.m_originalDisplay = v; }
-    void setPosition(EPosition v) { noninherited_data.m_position = v; }
-    void setFloating(EFloat v) { noninherited_data.m_floating = v; }
+    void setDisplay(EDisplay v) { m_nonInheritedData.m_effectiveDisplay = v; }
+    void setOriginalDisplay(EDisplay v) { m_nonInheritedData.m_originalDisplay = v; }
+    void setPosition(EPosition v) { m_nonInheritedData.m_position = v; }
+    void setFloating(EFloat v) { m_nonInheritedData.m_floating = v; }
 
-    void setLeft(const Length& v) { SET_VAR(surround, offset.m_left, v); }
-    void setRight(const Length& v) { SET_VAR(surround, offset.m_right, v); }
-    void setTop(const Length& v) { SET_VAR(surround, offset.m_top, v); }
-    void setBottom(const Length& v) { SET_VAR(surround, offset.m_bottom, v); }
+    void setLeft(const Length& v) { SET_VAR(m_surround, offset.m_left, v); }
+    void setRight(const Length& v) { SET_VAR(m_surround, offset.m_right, v); }
+    void setTop(const Length& v) { SET_VAR(m_surround, offset.m_top, v); }
+    void setBottom(const Length& v) { SET_VAR(m_surround, offset.m_bottom, v); }
 
     void setWidth(const Length& v) { SET_VAR(m_box, m_width, v); }
     void setHeight(const Length& v) { SET_VAR(m_box, m_height, v); }
 
     void setLogicalWidth(const Length& v)
     {
         if (isHorizontalWritingMode()) {
             SET_VAR(m_box, m_width, v);
         } else {
             SET_VAR(m_box, m_height, v);
         }
     }
 
     void setLogicalHeight(const Length& v)
     {
         if (isHorizontalWritingMode()) {
             SET_VAR(m_box, m_height, v);
         } else {
             SET_VAR(m_box, m_width, v);
         }
     }
 
     void setMinWidth(const Length& v) { SET_VAR(m_box, m_minWidth, v); }
     void setMaxWidth(const Length& v) { SET_VAR(m_box, m_maxWidth, v); }
     void setMinHeight(const Length& v) { SET_VAR(m_box, m_minHeight, v); }
     void setMaxHeight(const Length& v) { SET_VAR(m_box, m_maxHeight, v); }
 
-    DraggableRegionMode getDraggableRegionMode() const { return rareNonInheritedData->m_draggableRegionMode; }
-    void setDraggableRegionMode(DraggableRegionMode v) { SET_VAR(rareNonInheritedData, m_draggableRegionMode, v); }
+    DraggableRegionMode getDraggableRegionMode() const { return m_rareNonInheritedData->m_draggableRegionMode; }
+    void setDraggableRegionMode(DraggableRegionMode v) { SET_VAR(m_rareNonInheritedData, m_draggableRegionMode, v); }
 
     void resetBorder()
     {
         resetBorderImage();
         resetBorderTop();
         resetBorderRight();
         resetBorderBottom();
         resetBorderLeft();
         resetBorderTopLeftRadius();
         resetBorderTopRightRadius();
         resetBorderBottomLeftRadius();
         resetBorderBottomRightRadius();
     }
-    void resetBorderTop() { SET_VAR(surround, border.m_top, BorderValue()); }
-    void resetBorderRight() { SET_VAR(surround, border.m_right, BorderValue()); }
-    void resetBorderBottom() { SET_VAR(surround, border.m_bottom, BorderValue()); }
-    void resetBorderLeft() { SET_VAR(surround, border.m_left, BorderValue()); }
-    void resetBorderImage() { SET_VAR(surround, border.m_image, NinePieceImage()); }
-    void resetBorderTopLeftRadius() { SET_VAR(surround, border.m_topLeft, initialBorderRadius()); }
-    void resetBorderTopRightRadius() { SET_VAR(surround, border.m_topRight, initialBorderRadius()); }
-    void resetBorderBottomLeftRadius() { SET_VAR(surround, border.m_bottomLeft, initialBorderRadius()); }
-    void resetBorderBottomRightRadius() { SET_VAR(surround, border.m_bottomRight, initialBorderRadius()); }
+    void resetBorderTop() { SET_VAR(m_surround, border.m_top, BorderValue()); }
+    void resetBorderRight() { SET_VAR(m_surround, border.m_right, BorderValue()); }
+    void resetBorderBottom() { SET_VAR(m_surround, border.m_bottom, BorderValue()); }
+    void resetBorderLeft() { SET_VAR(m_surround, border.m_left, BorderValue()); }
+    void resetBorderImage() { SET_VAR(m_surround, border.m_image, NinePieceImage()); }
+    void resetBorderTopLeftRadius() { SET_VAR(m_surround, border.m_topLeft, initialBorderRadius()); }
+    void resetBorderTopRightRadius() { SET_VAR(m_surround, border.m_topRight, initialBorderRadius()); }
+    void resetBorderBottomLeftRadius() { SET_VAR(m_surround, border.m_bottomLeft, initialBorderRadius()); }
+    void resetBorderBottomRightRadius() { SET_VAR(m_surround, border.m_bottomRight, initialBorderRadius()); }
 
     void setBackgroundColor(const StyleColor& v) { SET_VAR(m_background, m_color, v); }
 
-    void setBorderImage(const NinePieceImage& b) { SET_VAR(surround, border.m_image, b); }
+    void setBorderImage(const NinePieceImage& b) { SET_VAR(m_surround, border.m_image, b); }
     void setBorderImageSource(StyleImage*);
     void setBorderImageSlices(const LengthBox&);
     void setBorderImageSlicesFill(bool);
     void setBorderImageWidth(const BorderImageLengthBox&);
     void setBorderImageOutset(const BorderImageLengthBox&);
 
-    void setBorderTopLeftRadius(const LengthSize& s) { SET_VAR(surround, border.m_topLeft, s); }
-    void setBorderTopRightRadius(const LengthSize& s) { SET_VAR(surround, border.m_topRight, s); }
-    void setBorderBottomLeftRadius(const LengthSize& s) { SET_VAR(surround, border.m_bottomLeft, s); }
-    void setBorderBottomRightRadius(const LengthSize& s) { SET_VAR(surround, border.m_bottomRight, s); }
+    void setBorderTopLeftRadius(const LengthSize& s) { SET_VAR(m_surround, border.m_topLeft, s); }
+    void setBorderTopRightRadius(const LengthSize& s) { SET_VAR(m_surround, border.m_topRight, s); }
+    void setBorderBottomLeftRadius(const LengthSize& s) { SET_VAR(m_surround, border.m_bottomLeft, s); }
+    void setBorderBottomRightRadius(const LengthSize& s) { SET_VAR(m_surround, border.m_bottomRight, s); }
 
     void setBorderRadius(const LengthSize& s)
     {
         setBorderTopLeftRadius(s);
         setBorderTopRightRadius(s);
         setBorderBottomLeftRadius(s);
         setBorderBottomRightRadius(s);
     }
     void setBorderRadius(const IntSize& s)
     {
         setBorderRadius(LengthSize(Length(s.width(), Fixed), Length(s.height(), Fixed)));
     }
 
     FloatRoundedRect getRoundedBorderFor(const LayoutRect& borderRect, bool includeLogicalLeftEdge = true,
         bool includeLogicalRightEdge = true) const;
     FloatRoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
 
     FloatRoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect,
         const LayoutRectOutsets insets, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
 
-    void setBorderLeftWidth(unsigned v) { SET_VAR(surround, border.m_left.m_width, v); }
-    void setBorderLeftStyle(EBorderStyle v) { SET_VAR(surround, border.m_left.m_style, v); }
-    void setBorderLeftColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surround, border.m_left, v); }
-    void setBorderRightWidth(unsigned v) { SET_VAR(surround, border.m_right.m_width, v); }
-    void setBorderRightStyle(EBorderStyle v) { SET_VAR(surround, border.m_right.m_style, v); }
-    void setBorderRightColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surround, border.m_right, v); }
-    void setBorderTopWidth(unsigned v) { SET_VAR(surround, border.m_top.m_width, v); }
-    void setBorderTopStyle(EBorderStyle v) { SET_VAR(surround, border.m_top.m_style, v); }
-    void setBorderTopColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surround, border.m_top, v); }
-    void setBorderBottomWidth(unsigned v) { SET_VAR(surround, border.m_bottom.m_width, v); }
-    void setBorderBottomStyle(EBorderStyle v) { SET_VAR(surround, border.m_bottom.m_style, v); }
-    void setBorderBottomColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surround, border.m_bottom, v); }
+    void setBorderLeftWidth(unsigned v) { SET_VAR(m_surround, border.m_left.m_width, v); }
+    void setBorderLeftStyle(EBorderStyle v) { SET_VAR(m_surround, border.m_left.m_style, v); }
+    void setBorderLeftColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(m_surround, border.m_left, v); }
+    void setBorderRightWidth(unsigned v) { SET_VAR(m_surround, border.m_right.m_width, v); }
+    void setBorderRightStyle(EBorderStyle v) { SET_VAR(m_surround, border.m_right.m_style, v); }
+    void setBorderRightColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(m_surround, border.m_right, v); }
+    void setBorderTopWidth(unsigned v) { SET_VAR(m_surround, border.m_top.m_width, v); }
+    void setBorderTopStyle(EBorderStyle v) { SET_VAR(m_surround, border.m_top.m_style, v); }
+    void setBorderTopColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(m_surround, border.m_top, v); }
+    void setBorderBottomWidth(unsigned v) { SET_VAR(m_surround, border.m_bottom.m_width, v); }
+    void setBorderBottomStyle(EBorderStyle v) { SET_VAR(m_surround, border.m_bottom.m_style, v); }
+    void setBorderBottomColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(m_surround, border.m_bottom, v); }
 
     void setOutlineWidth(unsigned short v) { SET_VAR(m_background, m_outline.m_width, v); }
     void setOutlineStyleIsAuto(OutlineIsAuto isAuto) { SET_VAR(m_background, m_outline.m_isAuto, isAuto); }
     void setOutlineStyle(EBorderStyle v) { SET_VAR(m_background, m_outline.m_style, v); }
     void setOutlineColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(m_background, m_outline, v); }
     bool isOutlineEquivalent(const ComputedStyle* otherStyle) const
     {
         // No other style, so we don't have an outline then we consider them to be the same.
         if (!otherStyle)
             return !hasOutline();
         return m_background->outline().visuallyEqual(otherStyle->m_background->outline());
     }
     void setOutlineFromStyle(const ComputedStyle& o)
     {
         ASSERT(!isOutlineEquivalent(&o));
         m_background.access()->m_outline = o.m_background->m_outline;
     }
 
-    void setOverflowX(EOverflow v) { noninherited_data.m_overflowX = v; }
-    void setOverflowY(EOverflow v) { noninherited_data.m_overflowY = v; }
-    void setVisibility(EVisibility v) { inherited_data.m_visibility = v; }
-    void setVerticalAlign(EVerticalAlign v) { noninherited_data.m_verticalAlign = v; }
+    void setOverflowX(EOverflow v) { m_nonInheritedData.m_overflowX = v; }
+    void setOverflowY(EOverflow v) { m_nonInheritedData.m_overflowY = v; }
+    void setVisibility(EVisibility v) { m_inheritedData.m_visibility = v; }
+    void setVerticalAlign(EVerticalAlign v) { m_nonInheritedData.m_verticalAlign = v; }
     void setVerticalAlignLength(const Length& length) { setVerticalAlign(VerticalAlignLength); SET_VAR(m_box, m_verticalAlign, length); }
 
-    void setHasAutoClip() { SET_VAR(visual, hasAutoClip, true); SET_VAR(visual, clip, ComputedStyle::initialClip()); }
-    void setClip(const LengthBox& box) { SET_VAR(visual, hasAutoClip, false); SET_VAR(visual, clip, box); }
+    void setHasAutoClip() { SET_VAR(m_visual, hasAutoClip, true); SET_VAR(m_visual, clip, ComputedStyle::initialClip()); }
+    void setClip(const LengthBox& box) { SET_VAR(m_visual, hasAutoClip, false); SET_VAR(m_visual, clip, box); }
 
-    void setUnicodeBidi(EUnicodeBidi b) { noninherited_data.m_unicodeBidi = b; }
+    void setUnicodeBidi(EUnicodeBidi b) { m_nonInheritedData.m_unicodeBidi = b; }
 
-    void setClear(EClear v) { noninherited_data.m_clear = v; }
-    void setTableLayout(ETableLayout v) { noninherited_data.m_tableLayout = v; }
+    void setClear(EClear v) { m_nonInheritedData.m_clear = v; }
+    void setTableLayout(ETableLayout v) { m_nonInheritedData.m_tableLayout = v; }
 
     bool setFontDescription(const FontDescription&);
     void setFont(const Font&);
 
     void setTextAutosizingMultiplier(float);
 
     void setColor(const Color&);
-    void setTextIndent(const Length& v) { SET_VAR(rareInheritedData, indent, v); }
-    void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_textIndentLine, v); }
-    void setTextIndentType(TextIndentType v) { SET_VAR(rareInheritedData, m_textIndentType, v); }
-    void setTextAlign(ETextAlign v) { inherited_data.m_textAlign = v; }
-    void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); }
-    void setTextJustify(TextJustify v) { SET_VAR(rareInheritedData, m_textJustify, v); }
-    void setTextTransform(ETextTransform v) { inherited_data.m_textTransform = v; }
+    void setTextIndent(const Length& v) { SET_VAR(m_rareInheritedData, indent, v); }
+    void setTextIndentLine(TextIndentLine v) { SET_VAR(m_rareInheritedData, m_textIndentLine, v); }
+    void setTextIndentType(TextIndentType v) { SET_VAR(m_rareInheritedData, m_textIndentType, v); }
+    void setTextAlign(ETextAlign v) { m_inheritedData.m_textAlign = v; }
+    void setTextAlignLast(TextAlignLast v) { SET_VAR(m_rareInheritedData, m_textAlignLast, v); }
+    void setTextJustify(TextJustify v) { SET_VAR(m_rareInheritedData, m_textJustify, v); }
+    void setTextTransform(ETextTransform v) { m_inheritedData.m_textTransform = v; }
     void applyTextDecorations();
     void clearAppliedTextDecorations();
-    void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v); }
-    void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInheritedData, m_textUnderlinePosition, v); }
-    void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInheritedData, m_textDecorationStyle, v); }
-    void setDirection(TextDirection v) { inherited_data.m_direction = v; }
-    void setSelfOrAncestorHasDirAutoAttribute(bool v) { SET_VAR(rareInheritedData, m_selfOrAncestorHasDirAutoAttribute, v); }
+    void setTextDecoration(TextDecoration v) { SET_VAR(m_visual, textDecoration, v); }
+    void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(m_rareInheritedData, m_textUnderlinePosition, v); }
+    void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(m_rareNonInheritedData, m_textDecorationStyle, v); }
+    void setDirection(TextDirection v) { m_inheritedData.m_direction = v; }
+    void setSelfOrAncestorHasDirAutoAttribute(bool v) { SET_VAR(m_rareInheritedData, m_selfOrAncestorHasDirAutoAttribute, v); }
     void setLineHeight(const Length& specifiedLineHeight);
     bool setZoom(float);
     bool setEffectiveZoom(float);
     void clearMultiCol();
 
-    void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_imageRendering, v); }
+    void setImageRendering(EImageRendering v) { SET_VAR(m_rareInheritedData, m_imageRendering, v); }
 
-    void setWhiteSpace(EWhiteSpace v) { inherited_data.m_whiteSpace = v; }
+    void setWhiteSpace(EWhiteSpace v) { m_inheritedData.m_whiteSpace = v; }
 
     // FIXME: Remove these two and replace them with respective FontBuilder calls.
     void setWordSpacing(float);
     void setLetterSpacing(float);
 
     void adjustBackgroundLayers()
     {
         if (backgroundLayers().next()) {
             accessBackgroundLayers().cullEmptyLayers();
             accessBackgroundLayers().fillUnsetProperties();
         }
     }
 
     void adjustMaskLayers()
     {
         if (maskLayers().next()) {
             accessMaskLayers().cullEmptyLayers();
             accessMaskLayers().fillUnsetProperties();
         }
     }
 
-    void setMaskBoxImage(const NinePieceImage& b) { SET_VAR(rareNonInheritedData, m_maskBoxImage, b); }
-    void setMaskBoxImageSource(StyleImage* v) { rareNonInheritedData.access()->m_maskBoxImage.setImage(v); }
+    void setMaskBoxImage(const NinePieceImage& b) { SET_VAR(m_rareNonInheritedData, m_maskBoxImage, b); }
+    void setMaskBoxImageSource(StyleImage* v) { m_rareNonInheritedData.access()->m_maskBoxImage.setImage(v); }
     void setMaskBoxImageSlices(const LengthBox& slices)
     {
-        rareNonInheritedData.access()->m_maskBoxImage.setImageSlices(slices);
+        m_rareNonInheritedData.access()->m_maskBoxImage.setImageSlices(slices);
     }
     void setMaskBoxImageSlicesFill(bool fill)
     {
-        rareNonInheritedData.access()->m_maskBoxImage.setFill(fill);
+        m_rareNonInheritedData.access()->m_maskBoxImage.setFill(fill);
     }
     void setMaskBoxImageWidth(const BorderImageLengthBox& slices)
     {
-        rareNonInheritedData.access()->m_maskBoxImage.setBorderSlices(slices);
+        m_rareNonInheritedData.access()->m_maskBoxImage.setBorderSlices(slices);
     }
     void setMaskBoxImageOutset(const BorderImageLengthBox& outset)
     {
-        rareNonInheritedData.access()->m_maskBoxImage.setOutset(outset);
+        m_rareNonInheritedData.access()->m_maskBoxImage.setOutset(outset);
     }
 
-    void setBorderCollapse(EBorderCollapse collapse) { inherited_data.m_borderCollapse = collapse; }
+    void setBorderCollapse(EBorderCollapse collapse) { m_inheritedData.m_borderCollapse = collapse; }
     void setHorizontalBorderSpacing(short);
     void setVerticalBorderSpacing(short);
-    void setEmptyCells(EEmptyCells v) { inherited_data.m_emptyCells = v; }
-    void setCaptionSide(ECaptionSide v) { inherited_data.m_captionSide = v; }
+    void setEmptyCells(EEmptyCells v) { m_inheritedData.m_emptyCells = v; }
+    void setCaptionSide(ECaptionSide v) { m_inheritedData.m_captionSide = v; }
 
-    void setListStyleType(EListStyleType v) { inherited_data.m_listStyleType = v; }
+    void setListStyleType(EListStyleType v) { m_inheritedData.m_listStyleType = v; }
     void setListStyleImage(StyleImage*);
-    void setListStylePosition(EListStylePosition v) { inherited_data.m_listStylePosition = v; }
+    void setListStylePosition(EListStylePosition v) { m_inheritedData.m_listStylePosition = v; }
 
-    void setMarginTop(const Length& v) { SET_VAR(surround, margin.m_top, v); }
-    void setMarginBottom(const Length& v) { SET_VAR(surround, margin.m_bottom, v); }
-    void setMarginLeft(const Length& v) { SET_VAR(surround, margin.m_left, v); }
-    void setMarginRight(const Length& v) { SET_VAR(surround, margin.m_right, v); }
+    void setMarginTop(const Length& v) { SET_VAR(m_surround, margin.m_top, v); }
+    void setMarginBottom(const Length& v) { SET_VAR(m_surround, margin.m_bottom, v); }
+    void setMarginLeft(const Length& v) { SET_VAR(m_surround, margin.m_left, v); }
+    void setMarginRight(const Length& v) { SET_VAR(m_surround, margin.m_right, v); }
     void setMarginStart(const Length&);
     void setMarginEnd(const Length&);
 
-    void resetPadding() { SET_VAR(surround, padding, LengthBox(Fixed)); }
-    void setPaddingBox(const LengthBox& b) { SET_VAR(surround, padding, b); }
-    void setPaddingTop(const Length& v) { SET_VAR(surround, padding.m_top, v); }
-    void setPaddingBottom(const Length& v) { SET_VAR(surround, padding.m_bottom, v); }
-    void setPaddingLeft(const Length& v) { SET_VAR(surround, padding.m_left, v); }
-    void setPaddingRight(const Length& v) { SET_VAR(surround, padding.m_right, v); }
+    void resetPadding() { SET_VAR(m_surround, padding, LengthBox(Fixed)); }
+    void setPaddingBox(const LengthBox& b) { SET_VAR(m_surround, padding, b); }
+    void setPaddingTop(const Length& v) { SET_VAR(m_surround, padding.m_top, v); }
+    void setPaddingBottom(const Length& v) { SET_VAR(m_surround, padding.m_bottom, v); }
+    void setPaddingLeft(const Length& v) { SET_VAR(m_surround, padding.m_left, v); }
+    void setPaddingRight(const Length& v) { SET_VAR(m_surround, padding.m_right, v); }
 
-    void setCursor(ECursor c) { inherited_data.m_cursorStyle = c; }
+    void setCursor(ECursor c) { m_inheritedData.m_cursorStyle = c; }
     void addCursor(StyleImage*, bool hotSpotSpecified, const IntPoint& hotSpot = IntPoint());
     void setCursorList(CursorList*);
     void clearCursorList();
 
-    void setInsideLink(EInsideLink insideLink) { inherited_data.m_insideLink = insideLink; }
-    void setIsLink(bool b) { noninherited_data.m_isLink = b; }
+    void setInsideLink(EInsideLink insideLink) { m_inheritedData.m_insideLink = insideLink; }
+    void setIsLink(bool b) { m_nonInheritedData.m_isLink = b; }
 
-    PrintColorAdjust getPrintColorAdjust() const { return static_cast<PrintColorAdjust>(inherited_data.m_printColorAdjust); }
-    void setPrintColorAdjust(PrintColorAdjust value) { inherited_data.m_printColorAdjust = value; }
+    PrintColorAdjust getPrintColorAdjust() const { return static_cast<PrintColorAdjust>(m_inheritedData.m_printColorAdjust); }
+    void setPrintColorAdjust(PrintColorAdjust value) { m_inheritedData.m_printColorAdjust = value; }
 
     // A stacking context is painted atomically and defines a stacking order, whereas
     // a containing stacking context defines in which order the stacking contexts
     // below are painted.
     // See CSS 2.1, Appendix E (https://www.w3.org/TR/CSS21/zindex.html) for more details.
-    bool isStackingContext() const { return rareNonInheritedData->m_isStackingContext; }
+    bool isStackingContext() const { return m_rareNonInheritedData->m_isStackingContext; }
 
     void updateIsStackingContext(bool isDocumentElement, bool isInTopLayer);
-    void setIsStackingContext(bool b) { SET_VAR(rareNonInheritedData, m_isStackingContext, b); }
+    void setIsStackingContext(bool b) { SET_VAR(m_rareNonInheritedData, m_isStackingContext, b); }
 
     // Stacking contexts and positioned elements[1] are stacked (sorted in negZOrderList
     // and posZOrderList) in their enclosing stacking contexts.
     //
     // [1] According to CSS2.1, Appendix E.2.8 (https://www.w3.org/TR/CSS21/zindex.html),
     // positioned elements with 'z-index: auto' are "treated as if it created a new
     // stacking context" and z-ordered together with other elements with 'z-index: 0'.
     // The difference of them from normal stacking contexts is that they don't determine
     // the stacking of the elements underneath them.
     // (Note: There are also other elements treated as stacking context during painting,
     // but not managed in stacks. See ObjectPainter::paintAllPhasesAtomically().)
     bool isStacked() const { return isStackingContext() || position() != StaticPosition; }
 
     bool hasAutoZIndex() const { return m_box->hasAutoZIndex(); }
     void setHasAutoZIndex() { SET_VAR(m_box, m_hasAutoZIndex, true); SET_VAR(m_box, m_zIndex, 0); }
     int zIndex() const { return m_box->zIndex(); }
     void setZIndex(int v) { SET_VAR(m_box, m_hasAutoZIndex, false); SET_VAR(m_box, m_zIndex, v); }
-    void setWidows(short w) { SET_VAR(rareInheritedData, widows, w); }
-    void setOrphans(short o) { SET_VAR(rareInheritedData, orphans, o); }
-    void setBreakAfter(EBreak b) { DCHECK_LE(b, BreakValueLastAllowedForBreakAfterAndBefore); noninherited_data.m_breakAfter = b; }
-    void setBreakBefore(EBreak b) { DCHECK_LE(b, BreakValueLastAllowedForBreakAfterAndBefore); noninherited_data.m_breakBefore = b;  }
-    void setBreakInside(EBreak b) { DCHECK_LE(b, BreakValueLastAllowedForBreakInside); noninherited_data.m_breakInside = b;  }
-
-    void setTextSizeAdjust(TextSizeAdjust sizeAdjust) { SET_VAR(rareInheritedData, m_textSizeAdjust, sizeAdjust); }
+    void setWidows(short w) { SET_VAR(m_rareInheritedData, widows, w); }
+    void setOrphans(short o) { SET_VAR(m_rareInheritedData, orphans, o); }
+    void setBreakAfter(EBreak b) { DCHECK_LE(b, BreakValueLastAllowedForBreakAfterAndBefore); m_nonInheritedData.m_breakAfter = b; }
+    void setBreakBefore(EBreak b) { DCHECK_LE(b, BreakValueLastAllowedForBreakAfterAndBefore); m_nonInheritedData.m_breakBefore = b;  }
+    void setBreakInside(EBreak b) { DCHECK_LE(b, BreakValueLastAllowedForBreakInside); m_nonInheritedData.m_breakInside = b;  }
+
+    void setTextSizeAdjust(TextSizeAdjust sizeAdjust) { SET_VAR(m_rareInheritedData, m_textSizeAdjust, sizeAdjust); }
 
     // CSS3 Setters
     void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v); }
     void setTextShadow(PassRefPtr<ShadowList>);
-    void setTextStrokeColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInheritedData, textStrokeColor, setTextStrokeColor, c); }
-    void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidth, w); }
-    void setTextFillColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInheritedData, textFillColor, setTextFillColor, c); }
-    void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNonInheritedData, opacity, v); }
-    void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearance, a); }
+    void setTextStrokeColor(const StyleColor& c) { SET_VAR_WITH_SETTER(m_rareInheritedData, textStrokeColor, setTextStrokeColor, c); }
+    void setTextStrokeWidth(float w) { SET_VAR(m_rareInheritedData, textStrokeWidth, w); }
+    void setTextFillColor(const StyleColor& c) { SET_VAR_WITH_SETTER(m_rareInheritedData, textFillColor, setTextFillColor, c); }
+    void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(m_rareNonInheritedData, opacity, v); }
+    void setAppearance(ControlPart a) { SET_VAR(m_rareNonInheritedData, m_appearance, a); }
     // For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/#alignment
-    void setBoxAlign(EBoxAlignment a) { SET_NESTED_VAR(rareNonInheritedData, m_deprecatedFlexibleBox, align, a); }
+    void setBoxAlign(EBoxAlignment a) { SET_NESTED_VAR(m_rareNonInheritedData, m_deprecatedFlexibleBox, align, a); }
     void setBoxDecorationBreak(EBoxDecorationBreak b) { SET_VAR(m_box, m_boxDecorationBreak, b); }
-    void setBoxDirection(EBoxDirection d) { inherited_data.m_boxDirection = d; }
-    void setBoxFlex(float f) { SET_NESTED_VAR(rareNonInheritedData, m_deprecatedFlexibleBox, flex, f); }
-    void setBoxFlexGroup(unsigned fg) { SET_NESTED_VAR(rareNonInheritedData, m_deprecatedFlexibleBox, flexGroup, fg); }
-    void setBoxLines(EBoxLines l) { SET_NESTED_VAR(rareNonInheritedData, m_deprecatedFlexibleBox, lines, l); }
-    void setBoxOrdinalGroup(unsigned og) { SET_NESTED_VAR(rareNonInheritedData, m_deprecatedFlexibleBox, ordinalGroup, og); }
-    void setBoxOrient(EBoxOrient o) { SET_NESTED_VAR(rareNonInheritedData, m_deprecatedFlexibleBox, orient, o); }
-    void setBoxPack(EBoxPack p) { SET_NESTED_VAR(rareNonInheritedData, m_deprecatedFlexibleBox, pack, p); }
+    void setBoxDirection(EBoxDirection d) { m_inheritedData.m_boxDirection = d; }
+    void setBoxFlex(float f) { SET_NESTED_VAR(m_rareNonInheritedData, m_deprecatedFlexibleBox, flex, f); }
+    void setBoxFlexGroup(unsigned fg) { SET_NESTED_VAR(m_rareNonInheritedData, m_deprecatedFlexibleBox, flexGroup, fg); }
+    void setBoxLines(EBoxLines lines) { SET_NESTED_VAR(m_rareNonInheritedData, m_deprecatedFlexibleBox, lines, lines); }
+    void setBoxOrdinalGroup(unsigned og) { SET_NESTED_VAR(m_rareNonInheritedData, m_deprecatedFlexibleBox, ordinalGroup, og); }
+    void setBoxOrient(EBoxOrient o) { SET_NESTED_VAR(m_rareNonInheritedData, m_deprecatedFlexibleBox, orient, o); }
+    void setBoxPack(EBoxPack p) { SET_NESTED_VAR(m_rareNonInheritedData, m_deprecatedFlexibleBox, pack, p); }
     void setBoxShadow(PassRefPtr<ShadowList>);
-    void setBoxReflect(PassRefPtr<StyleReflection> reflect) { if (rareNonInheritedData->m_boxReflect != reflect) rareNonInheritedData.access()->m_boxReflect = reflect; }
+    void setBoxReflect(PassRefPtr<StyleReflection> reflect)
+    {
+        if (m_rareNonInheritedData->m_boxReflect != reflect)
+            m_rareNonInheritedData.access()->m_boxReflect = reflect;
+    }
     void setBoxSizing(EBoxSizing s) { SET_VAR(m_box, m_boxSizing, s); }
-    void setContain(Containment contain) { SET_VAR(rareNonInheritedData, m_contain, contain); }
-    void setFlexGrow(float f) { SET_NESTED_VAR(rareNonInheritedData, m_flexibleBox, m_flexGrow, f); }
-    void setFlexShrink(float f) { SET_NESTED_VAR(rareNonInheritedData, m_flexibleBox, m_flexShrink, f); }
-    void setFlexBasis(const Length& length) { SET_NESTED_VAR(rareNonInheritedData, m_flexibleBox, m_flexBasis, length); }
+    void setContain(Containment contain) { SET_VAR(m_rareNonInheritedData, m_contain, contain); }
+    void setFlexGrow(float f) { SET_NESTED_VAR(m_rareNonInheritedData, m_flexibleBox, m_flexGrow, f); }
+    void setFlexShrink(float f) { SET_NESTED_VAR(m_rareNonInheritedData, m_flexibleBox, m_flexShrink, f); }
+    void setFlexBasis(const Length& length) { SET_NESTED_VAR(m_rareNonInheritedData, m_flexibleBox, m_flexBasis, length); }
     // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set.
-    void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, max(std::numeric_limits<int>::min() + 2, o)); }
+    void setOrder(int o) { SET_VAR(m_rareNonInheritedData, m_order, max(std::numeric_limits<int>::min() + 2, o)); }
     void addCallbackSelector(const String& selector);
-    void setAlignContent(const StyleContentAlignmentData& data) { SET_VAR(rareNonInheritedData, m_alignContent, data); }
-    void setAlignContentPosition(ContentPosition position) { rareNonInheritedData.access()->m_alignContent.setPosition(position); }
-    void setAlignContentDistribution(ContentDistributionType distribution) { rareNonInheritedData.access()->m_alignContent.setDistribution(distribution); }
-    void setAlignContentOverflow(OverflowAlignment overflow) { rareNonInheritedData.access()->m_alignContent.setOverflow(overflow); }
-    void setAlignItems(const StyleSelfAlignmentData& data) { SET_VAR(rareNonInheritedData, m_alignItems, data); }
-    void setAlignItemsPosition(ItemPosition position) { rareNonInheritedData.access()->m_alignItems.setPosition(position); }
-    void setAlignItemsOverflow(OverflowAlignment overflow) { rareNonInheritedData.access()->m_alignItems.setOverflow(overflow); }
-    void setAlignSelf(const StyleSelfAlignmentData& data) { SET_VAR(rareNonInheritedData, m_alignSelf, data); }
-    void setAlignSelfPosition(ItemPosition position) { rareNonInheritedData.access()->m_alignSelf.setPosition(position); }
-    void setAlignSelfOverflow(OverflowAlignment overflow) { rareNonInheritedData.access()->m_alignSelf.setOverflow(overflow); }
-    void setFlexDirection(EFlexDirection direction) { SET_NESTED_VAR(rareNonInheritedData, m_flexibleBox, m_flexDirection, direction); }
-    void setFlexWrap(EFlexWrap w) { SET_NESTED_VAR(rareNonInheritedData, m_flexibleBox, m_flexWrap, w); }
-    void setJustifyContent(const StyleContentAlignmentData& data) { SET_VAR(rareNonInheritedData, m_justifyContent, data); }
-    void setJustifyContentPosition(ContentPosition position) { rareNonInheritedData.access()->m_justifyContent.setPosition(position); }
-    void setJustifyContentDistribution(ContentDistributionType distribution) { rareNonInheritedData.access()->m_justifyContent.setDistribution(distribution); }
-    void setJustifyContentOverflow(OverflowAlignment overflow) { rareNonInheritedData.access()->m_justifyContent.setOverflow(overflow); }
-    void setJustifyItems(const StyleSelfAlignmentData& data) { SET_VAR(rareNonInheritedData, m_justifyItems, data); }
-    void setJustifyItemsPosition(ItemPosition position) { rareNonInheritedData.access()->m_justifyItems.setPosition(position); }
-    void setJustifyItemsOverflow(OverflowAlignment overflow) { rareNonInheritedData.access()->m_justifyItems.setOverflow(overflow); }
-    void setJustifyItemsPositionType(ItemPositionType positionType) { rareNonInheritedData.access()->m_justifyItems.setPositionType(positionType); }
-    void setJustifySelf(const StyleSelfAlignmentData& data) { SET_VAR(rareNonInheritedData, m_justifySelf, data); }
-    void setJustifySelfPosition(ItemPosition position) { rareNonInheritedData.access()->m_justifySelf.setPosition(position); }
-    void setJustifySelfOverflow(OverflowAlignment overflow) { rareNonInheritedData.access()->m_justifySelf.setOverflow(overflow); }
-    void setGridAutoColumns(const GridTrackSize& length) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_gridAutoColumns, length); }
-    void setGridAutoRows(const GridTrackSize& length) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_gridAutoRows, length); }
-    void setGridTemplateColumns(const Vector<GridTrackSize>& lengths) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_gridTemplateColumns, lengths); }
-    void setGridTemplateRows(const Vector<GridTrackSize>& lengths) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_gridTemplateRows, lengths); }
-    void setGridAutoRepeatColumns(const Vector<GridTrackSize>& trackSizes) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_gridAutoRepeatColumns, trackSizes); }
-    void setGridAutoRepeatRows(const Vector<GridTrackSize>& trackSizes) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_gridAutoRepeatRows, trackSizes); }
-    void setGridAutoRepeatColumnsInsertionPoint(const size_t insertionPoint) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_autoRepeatColumnsInsertionPoint, insertionPoint); }
-    void setGridAutoRepeatRowsInsertionPoint(const size_t insertionPoint) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_autoRepeatRowsInsertionPoint, insertionPoint); }
-    void setGridAutoRepeatColumnsType(const AutoRepeatType autoRepeatType) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_autoRepeatColumnsType, autoRepeatType); }
-    void setGridAutoRepeatRowsType(const AutoRepeatType autoRepeatType) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_autoRepeatRowsType, autoRepeatType); }
-    void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_namedGridColumnLines, namedGridColumnLines); }
-    void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_namedGridRowLines, namedGridRowLines); }
-    void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedNamedGridColumnLines) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_orderedNamedGridColumnLines, orderedNamedGridColumnLines); }
-    void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGridRowLines) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_orderedNamedGridRowLines, orderedNamedGridRowLines); }
-    void setAutoRepeatNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_autoRepeatNamedGridColumnLines, namedGridColumnLines); }
-    void setAutoRepeatNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_autoRepeatNamedGridRowLines, namedGridRowLines); }
-    void setAutoRepeatOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedNamedGridColumnLines) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_autoRepeatOrderedNamedGridColumnLines, orderedNamedGridColumnLines); }
-    void setAutoRepeatOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGridRowLines) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_autoRepeatOrderedNamedGridRowLines, orderedNamedGridRowLines); }
-    void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_namedGridArea, namedGridArea); }
-    void setNamedGridAreaRowCount(size_t rowCount) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_namedGridAreaRowCount, rowCount); }
-    void setNamedGridAreaColumnCount(size_t columnCount) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_namedGridAreaColumnCount, columnCount); }
-    void setGridAutoFlow(GridAutoFlow flow) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_gridAutoFlow, flow); }
-
-    void setGridColumnStart(const GridPosition& columnStartPosition) { SET_NESTED_VAR(rareNonInheritedData, m_gridItem, m_gridColumnStart, columnStartPosition); }
-    void setGridColumnEnd(const GridPosition& columnEndPosition) { SET_NESTED_VAR(rareNonInheritedData, m_gridItem, m_gridColumnEnd, columnEndPosition); }
-    void setGridRowStart(const GridPosition& rowStartPosition) { SET_NESTED_VAR(rareNonInheritedData, m_gridItem, m_gridRowStart, rowStartPosition); }
-    void setGridRowEnd(const GridPosition& rowEndPosition) { SET_NESTED_VAR(rareNonInheritedData, m_gridItem, m_gridRowEnd, rowEndPosition); }
-    void setGridColumnGap(const Length& v) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_gridColumnGap, v); }
-    void setGridRowGap(const Length& v) { SET_NESTED_VAR(rareNonInheritedData, m_grid, m_gridRowGap, v); }
-
-    void setUserModify(EUserModify u) { SET_VAR(rareInheritedData, userModify, u); }
-    void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); }
-    void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s); }
-    void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); }
-    void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedData, marginBeforeCollapse, c); }
-    void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedData, marginAfterCollapse, c); }
-    void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); }
-    void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowWrap, b); }
-    void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); }
-    void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highlight, h); }
-    void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }
-    void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData, hyphenationString, h); }
-    void setResize(EResize r) { SET_VAR(rareNonInheritedData, m_resize, r); }
-    void setColumnWidth(float f) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_autoWidth, false); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_width, f); }
-    void setHasAutoColumnWidth() { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_autoWidth, true); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_width, 0); }
-    void setColumnCount(unsigned short c) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_autoCount, false); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_count, c); }
-    void setHasAutoColumnCount() { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_autoCount, true); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_count, initialColumnCount()); }
-    void setColumnFill(ColumnFill columnFill) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_fill, columnFill); }
-    void setColumnGap(float f) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_normalGap, false); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_gap, f); }
-    void setHasNormalColumnGap() { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_normalGap, true); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_gap, 0); }
-    void setColumnRuleColor(const StyleColor& c) { SET_BORDERVALUE_COLOR(rareNonInheritedData.access()->m_multiCol, m_rule, c); }
-    void setColumnRuleStyle(EBorderStyle b) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_rule.m_style, b); }
-    void setColumnRuleWidth(unsigned short w) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_rule.m_width, w); }
-    void setColumnSpan(ColumnSpan columnSpan) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_columnSpan, columnSpan); }
-    void inheritColumnPropertiesFrom(const ComputedStyle& parent) { rareNonInheritedData.access()->m_multiCol = parent.rareNonInheritedData->m_multiCol; }
-    void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInlineTransform, b); }
-    void setHasCompositorProxy(bool b) { SET_VAR(rareNonInheritedData, m_hasCompositorProxy, b); }
-    void setTransform(const TransformOperations& ops) { SET_NESTED_VAR(rareNonInheritedData, m_transform, m_operations, ops); }
+    void setAlignContent(const StyleContentAlignmentData& data) { SET_VAR(m_rareNonInheritedData, m_alignContent, data); }
+    void setAlignContentPosition(ContentPosition position) { m_rareNonInheritedData.access()->m_alignContent.setPosition(position); }
+    void setAlignContentDistribution(ContentDistributionType distribution) { m_rareNonInheritedData.access()->m_alignContent.setDistribution(distribution); }
+    void setAlignContentOverflow(OverflowAlignment overflow) { m_rareNonInheritedData.access()->m_alignContent.setOverflow(overflow); }
+    void setAlignItems(const StyleSelfAlignmentData& data) { SET_VAR(m_rareNonInheritedData, m_alignItems, data); }
+    void setAlignItemsPosition(ItemPosition position) { m_rareNonInheritedData.access()->m_alignItems.setPosition(position); }
+    void setAlignItemsOverflow(OverflowAlignment overflow) { m_rareNonInheritedData.access()->m_alignItems.setOverflow(overflow); }
+    void setAlignSelf(const StyleSelfAlignmentData& data) { SET_VAR(m_rareNonInheritedData, m_alignSelf, data); }
+    void setAlignSelfPosition(ItemPosition position) { m_rareNonInheritedData.access()->m_alignSelf.setPosition(position); }
+    void setAlignSelfOverflow(OverflowAlignment overflow) { m_rareNonInheritedData.access()->m_alignSelf.setOverflow(overflow); }
+    void setFlexDirection(EFlexDirection direction) { SET_NESTED_VAR(m_rareNonInheritedData, m_flexibleBox, m_flexDirection, direction); }
+    void setFlexWrap(EFlexWrap w) { SET_NESTED_VAR(m_rareNonInheritedData, m_flexibleBox, m_flexWrap, w); }
+    void setJustifyContent(const StyleContentAlignmentData& data) { SET_VAR(m_rareNonInheritedData, m_justifyContent, data); }
+    void setJustifyContentPosition(ContentPosition position) { m_rareNonInheritedData.access()->m_justifyContent.setPosition(position); }
+    void setJustifyContentDistribution(ContentDistributionType distribution) { m_rareNonInheritedData.access()->m_justifyContent.setDistribution(distribution); }
+    void setJustifyContentOverflow(OverflowAlignment overflow) { m_rareNonInheritedData.access()->m_justifyContent.setOverflow(overflow); }
+    void setJustifyItems(const StyleSelfAlignmentData& data) { SET_VAR(m_rareNonInheritedData, m_justifyItems, data); }
+    void setJustifyItemsPosition(ItemPosition position) { m_rareNonInheritedData.access()->m_justifyItems.setPosition(position); }
+    void setJustifyItemsOverflow(OverflowAlignment overflow) { m_rareNonInheritedData.access()->m_justifyItems.setOverflow(overflow); }
+    void setJustifyItemsPositionType(ItemPositionType positionType) { m_rareNonInheritedData.access()->m_justifyItems.setPositionType(positionType); }
+    void setJustifySelf(const StyleSelfAlignmentData& data) { SET_VAR(m_rareNonInheritedData, m_justifySelf, data); }
+    void setJustifySelfPosition(ItemPosition position) { m_rareNonInheritedData.access()->m_justifySelf.setPosition(position); }
+    void setJustifySelfOverflow(OverflowAlignment overflow) { m_rareNonInheritedData.access()->m_justifySelf.setOverflow(overflow); }
+    void setGridAutoColumns(const GridTrackSize& length) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_gridAutoColumns, length); }
+    void setGridAutoRows(const GridTrackSize& length) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_gridAutoRows, length); }
+    void setGridTemplateColumns(const Vector<GridTrackSize>& lengths) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_gridTemplateColumns, lengths); }
+    void setGridTemplateRows(const Vector<GridTrackSize>& lengths) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_gridTemplateRows, lengths); }
+    void setGridAutoRepeatColumns(const Vector<GridTrackSize>& trackSizes) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_gridAutoRepeatColumns, trackSizes); }
+    void setGridAutoRepeatRows(const Vector<GridTrackSize>& trackSizes) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_gridAutoRepeatRows, trackSizes); }
+    void setGridAutoRepeatColumnsInsertionPoint(const size_t insertionPoint) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_autoRepeatColumnsInsertionPoint, insertionPoint); }
+    void setGridAutoRepeatRowsInsertionPoint(const size_t insertionPoint) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_autoRepeatRowsInsertionPoint, insertionPoint); }
+    void setGridAutoRepeatColumnsType(const AutoRepeatType autoRepeatType) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_autoRepeatColumnsType, autoRepeatType); }
+    void setGridAutoRepeatRowsType(const AutoRepeatType autoRepeatType) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_autoRepeatRowsType, autoRepeatType); }
+    void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_namedGridColumnLines, namedGridColumnLines); }
+    void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_namedGridRowLines, namedGridRowLines); }
+    void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedNamedGridColumnLines) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_orderedNamedGridColumnLines, orderedNamedGridColumnLines); }
+    void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGridRowLines) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_orderedNamedGridRowLines, orderedNamedGridRowLines); }
+    void setAutoRepeatNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_autoRepeatNamedGridColumnLines, namedGridColumnLines); }
+    void setAutoRepeatNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_autoRepeatNamedGridRowLines, namedGridRowLines); }
+    void setAutoRepeatOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedNamedGridColumnLines) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_autoRepeatOrderedNamedGridColumnLines, orderedNamedGridColumnLines); }
+    void setAutoRepeatOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGridRowLines) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_autoRepeatOrderedNamedGridRowLines, orderedNamedGridRowLines); }
+    void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_namedGridArea, namedGridArea); }
+    void setNamedGridAreaRowCount(size_t rowCount) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_namedGridAreaRowCount, rowCount); }
+    void setNamedGridAreaColumnCount(size_t columnCount) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_namedGridAreaColumnCount, columnCount); }
+    void setGridAutoFlow(GridAutoFlow flow) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_gridAutoFlow, flow); }
+
+    void setGridColumnStart(const GridPosition& columnStartPosition) { SET_NESTED_VAR(m_rareNonInheritedData, m_gridItem, m_gridColumnStart, columnStartPosition); }
+    void setGridColumnEnd(const GridPosition& columnEndPosition) { SET_NESTED_VAR(m_rareNonInheritedData, m_gridItem, m_gridColumnEnd, columnEndPosition); }
+    void setGridRowStart(const GridPosition& rowStartPosition) { SET_NESTED_VAR(m_rareNonInheritedData, m_gridItem, m_gridRowStart, rowStartPosition); }
+    void setGridRowEnd(const GridPosition& rowEndPosition) { SET_NESTED_VAR(m_rareNonInheritedData, m_gridItem, m_gridRowEnd, rowEndPosition); }
+    void setGridColumnGap(const Length& v) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_gridColumnGap, v); }
+    void setGridRowGap(const Length& v) { SET_NESTED_VAR(m_rareNonInheritedData, m_grid, m_gridRowGap, v); }
+
+    void setUserModify(EUserModify u) { SET_VAR(m_rareInheritedData, userModify, u); }
+    void setUserDrag(EUserDrag d) { SET_VAR(m_rareNonInheritedData, userDrag, d); }
+    void setUserSelect(EUserSelect s) { SET_VAR(m_rareInheritedData, userSelect, s); }
+    void setTextOverflow(TextOverflow overflow) { SET_VAR(m_rareNonInheritedData, textOverflow, overflow); }
+    void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(m_rareNonInheritedData, marginBeforeCollapse, c); }
+    void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(m_rareNonInheritedData, marginAfterCollapse, c); }
+    void setWordBreak(EWordBreak b) { SET_VAR(m_rareInheritedData, wordBreak, b); }
+    void setOverflowWrap(EOverflowWrap b) { SET_VAR(m_rareInheritedData, overflowWrap, b); }
+    void setLineBreak(LineBreak b) { SET_VAR(m_rareInheritedData, lineBreak, b); }
+    void setHighlight(const AtomicString& h) { SET_VAR(m_rareInheritedData, highlight, h); }
+    void setHyphens(Hyphens h) { SET_VAR(m_rareInheritedData, hyphens, h); }
+    void setHyphenationString(const AtomicString& h) { SET_VAR(m_rareInheritedData, hyphenationString, h); }
+    void setResize(EResize r) { SET_VAR(m_rareNonInheritedData, m_resize, r); }
+    void setColumnWidth(float f) { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_autoWidth, false); SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_width, f); }
+    void setHasAutoColumnWidth() { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_autoWidth, true); SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_width, 0); }
+    void setColumnCount(unsigned short c) { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_autoCount, false); SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_count, c); }
+    void setHasAutoColumnCount() { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_autoCount, true); SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_count, initialColumnCount()); }
+    void setColumnFill(ColumnFill columnFill) { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_fill, columnFill); }
+    void setColumnGap(float f) { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_normalGap, false); SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_gap, f); }
+    void setHasNormalColumnGap() { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_normalGap, true); SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_gap, 0); }
+    void setColumnRuleColor(const StyleColor& c) { SET_BORDERVALUE_COLOR(m_rareNonInheritedData.access()->m_multiCol, m_rule, c); }
+    void setColumnRuleStyle(EBorderStyle b) { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_rule.m_style, b); }
+    void setColumnRuleWidth(unsigned short w) { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_rule.m_width, w); }
+    void setColumnSpan(ColumnSpan columnSpan) { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_columnSpan, columnSpan); }
+    void inheritColumnPropertiesFrom(const ComputedStyle& parent) { m_rareNonInheritedData.access()->m_multiCol = parent.m_rareNonInheritedData->m_multiCol; }
+    void setHasInlineTransform(bool b) { SET_VAR(m_rareNonInheritedData, m_hasInlineTransform, b); }
+    void setHasCompositorProxy(bool b) { SET_VAR(m_rareNonInheritedData, m_hasCompositorProxy, b); }
+    void setTransform(const TransformOperations& ops) { SET_NESTED_VAR(m_rareNonInheritedData, m_transform, m_operations, ops); }
     void setTransformOriginX(const Length& v) { setTransformOrigin(TransformOrigin(v, transformOriginY(), transformOriginZ())); }
     void setTransformOriginY(const Length& v) { setTransformOrigin(TransformOrigin(transformOriginX(), v, transformOriginZ())); }
     void setTransformOriginZ(float f) { setTransformOrigin(TransformOrigin(transformOriginX(), transformOriginY(), f)); }
-    void setTransformOrigin(const TransformOrigin& o) { SET_NESTED_VAR(rareNonInheritedData, m_transform, m_origin, o); }
-    void setTranslate(PassRefPtr<TranslateTransformOperation> v) { rareNonInheritedData.access()->m_transform.access()->m_translate = v; }
-    void setRotate(PassRefPtr<RotateTransformOperation> v) { rareNonInheritedData.access()->m_transform.access()->m_rotate = v; }
-    void setScale(PassRefPtr<ScaleTransformOperation> v) { rareNonInheritedData.access()->m_transform.access()->m_scale = v; }
-
-    void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); }
-    void setTextCombine(TextCombine v) { SET_VAR(rareInheritedData, m_textCombine, v); }
-    void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); }
-    void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInheritedData, textEmphasisColor, setTextEmphasisColor, c); }
-    void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }
-    void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); }
-    void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInheritedData, textEmphasisCustomMark, mark); }
-    void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareInheritedData, textEmphasisPosition, position); }
+    void setTransformOrigin(const TransformOrigin& o) { SET_NESTED_VAR(m_rareNonInheritedData, m_transform, m_origin, o); }
+    void setTranslate(PassRefPtr<TranslateTransformOperation> v) { m_rareNonInheritedData.access()->m_transform.access()->m_translate = v; }
+    void setRotate(PassRefPtr<RotateTransformOperation> v) { m_rareNonInheritedData.access()->m_transform.access()->m_rotate = v; }
+    void setScale(PassRefPtr<ScaleTransformOperation> v) { m_rareNonInheritedData.access()->m_transform.access()->m_scale = v; }
+
+    void setSpeak(ESpeak s) { SET_VAR(m_rareInheritedData, speak, s); }
+    void setTextCombine(TextCombine v) { SET_VAR(m_rareInheritedData, m_textCombine, v); }
+    void setTextDecorationColor(const StyleColor& c) { SET_VAR(m_rareNonInheritedData, m_textDecorationColor, c); }
+    void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(m_rareInheritedData, textEmphasisColor, setTextEmphasisColor, c); }
+    void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(m_rareInheritedData, textEmphasisFill, fill); }
+    void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(m_rareInheritedData, textEmphasisMark, mark); }
+    void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(m_rareInheritedData, textEmphasisCustomMark, mark); }
+    void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(m_rareInheritedData, textEmphasisPosition, position); }
     bool setTextOrientation(TextOrientation);
 
     void setMotionPath(PassRefPtr<StylePath>);
-    void setMotionOffset(const Length& motionOffset) { SET_NESTED_VAR(rareNonInheritedData, m_transform, m_motion.m_offset, motionOffset); }
-    void setMotionRotation(const StyleMotionRotation& motionRotation) { SET_NESTED_VAR(rareNonInheritedData, m_transform, m_motion.m_rotation, motionRotation); }
-
-    void setObjectFit(ObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); }
-    void setObjectPosition(LengthPoint position) { SET_VAR(rareNonInheritedData, m_objectPosition, position); }
-
-    void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_rubyPosition, position); }
-
-    void setFilter(const FilterOperations& ops) { SET_NESTED_VAR(rareNonInheritedData, m_filter, m_operations, ops); }
-    void setBackdropFilter(const FilterOperations& ops) { SET_NESTED_VAR(rareNonInheritedData, m_backdropFilter, m_operations, ops); }
-
-    void setSnapHeightPosition(uint8_t position) { SET_VAR(rareInheritedData, m_snapHeightPosition, position); }
-    void setSnapHeightUnit(uint8_t unit) { SET_VAR(rareInheritedData, m_snapHeightUnit, unit); }
-
-    void setTabSize(TabSize size) { SET_VAR(rareInheritedData, m_tabSize, size); }
-
-    void setRespectImageOrientation(RespectImageOrientationEnum v) { SET_VAR(rareInheritedData, m_respectImageOrientation, v); }
+    void setMotionOffset(const Length& motionOffset) { SET_NESTED_VAR(m_rareNonInheritedData, m_transform, m_motion.m_offset, motionOffset); }
+    void setMotionRotation(const StyleMotionRotation& motionRotation) { SET_NESTED_VAR(m_rareNonInheritedData, m_transform, m_motion.m_rotation, motionRotation); }
+
+    void setObjectFit(ObjectFit f) { SET_VAR(m_rareNonInheritedData, m_objectFit, f); }
+    void setObjectPosition(LengthPoint position) { SET_VAR(m_rareNonInheritedData, m_objectPosition, position); }
+
+    void setRubyPosition(RubyPosition position) { SET_VAR(m_rareInheritedData, m_rubyPosition, position); }
+
+    void setFilter(const FilterOperations& ops) { SET_NESTED_VAR(m_rareNonInheritedData, m_filter, m_operations, ops); }
+    void setBackdropFilter(const FilterOperations& ops) { SET_NESTED_VAR(m_rareNonInheritedData, m_backdropFilter, m_operations, ops); }
+
+    void setSnapHeightPosition(uint8_t position) { SET_VAR(m_rareInheritedData, m_snapHeightPosition, position); }
+    void setSnapHeightUnit(uint8_t unit) { SET_VAR(m_rareInheritedData, m_snapHeightUnit, unit); }
+
+    void setTabSize(TabSize size) { SET_VAR(m_rareInheritedData, m_tabSize, size); }
+
+    void setRespectImageOrientation(RespectImageOrientationEnum v) { SET_VAR(m_rareInheritedData, m_respectImageOrientation, v); }
 
     // End CSS3 Setters
 
-    void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFlow, wrapFlow); }
-    void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); }
+    void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(m_rareNonInheritedData, m_wrapFlow, wrapFlow); }
+    void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(m_rareNonInheritedData, m_wrapThrough, wrapThrough); }
 
     // Apple-specific property setters
-    void setPointerEvents(EPointerEvents p) { inherited_data.m_pointerEvents = p; }
-
-    void setTransformStyle3D(ETransformStyle3D b) { SET_VAR(rareNonInheritedData, m_transformStyle3D, b); }
-    void setBackfaceVisibility(EBackfaceVisibility b) { SET_VAR(rareNonInheritedData, m_backfaceVisibility, b); }
-    void setPerspective(float p) { SET_VAR(rareNonInheritedData, m_perspective, p); }
+    void setPointerEvents(EPointerEvents p) { m_inheritedData.m_pointerEvents = p; }
+
+    void setTransformStyle3D(ETransformStyle3D b) { SET_VAR(m_rareNonInheritedData, m_transformStyle3D, b); }
+    void setBackfaceVisibility(EBackfaceVisibility b) { SET_VAR(m_rareNonInheritedData, m_backfaceVisibility, b); }
+    void setPerspective(float p) { SET_VAR(m_rareNonInheritedData, m_perspective, p); }
     void setPerspectiveOriginX(const Length& v) { setPerspectiveOrigin(LengthPoint(v, perspectiveOriginY())); }
     void setPerspectiveOriginY(const Length& v) { setPerspectiveOrigin(LengthPoint(perspectiveOriginX(), v)); }
-    void setPerspectiveOrigin(const LengthPoint& p) { SET_VAR(rareNonInheritedData, m_perspectiveOrigin, p); }
-    void setPageSize(const FloatSize& s) { SET_VAR(rareNonInheritedData, m_pageSize, s); }
-    void setPageSizeType(PageSizeType t) { SET_VAR(rareNonInheritedData, m_pageSizeType, t); }
-    void resetPageSizeType() { SET_VAR(rareNonInheritedData, m_pageSizeType, PAGE_SIZE_AUTO); }
-
-    void setHasCurrentOpacityAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_hasCurrentOpacityAnimation, b); }
-    void setHasCurrentTransformAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_hasCurrentTransformAnimation, b); }
-    void setHasCurrentFilterAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_hasCurrentFilterAnimation, b); }
-    void setHasCurrentBackdropFilterAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_hasCurrentBackdropFilterAnimation, b); }
-
-    void setIsRunningOpacityAnimationOnCompositor(bool b = true) { SET_VAR(rareNonInheritedData, m_runningOpacityAnimationOnCompositor, b); }
-    void setIsRunningTransformAnimationOnCompositor(bool b = true) { SET_VAR(rareNonInheritedData, m_runningTransformAnimationOnCompositor, b); }
-    void setIsRunningFilterAnimationOnCompositor(bool b = true) { SET_VAR(rareNonInheritedData, m_runningFilterAnimationOnCompositor, b); }
-    void setIsRunningBackdropFilterAnimationOnCompositor(bool b = true) { SET_VAR(rareNonInheritedData, m_runningBackdropFilterAnimationOnCompositor, b); }
-
-    void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClamp, c); }
-    void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHighlightColor, c); }
-    void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedData, textSecurity, aTextSecurity); }
-    void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAction, t); }
-
-    void setScrollBehavior(ScrollBehavior b) { SET_VAR(rareNonInheritedData, m_scrollBehavior, b); }
-
-    void setScrollSnapType(ScrollSnapType b) { SET_VAR(rareNonInheritedData, m_scrollSnapType, b); }
-    void setScrollSnapPointsX(const ScrollSnapPoints& b) { SET_NESTED_VAR(rareNonInheritedData, m_scrollSnap, m_xPoints, b); }
-    void setScrollSnapPointsY(const ScrollSnapPoints& b) { SET_NESTED_VAR(rareNonInheritedData, m_scrollSnap, m_yPoints, b); }
-    void setScrollSnapDestination(const LengthPoint& b) { SET_NESTED_VAR(rareNonInheritedData, m_scrollSnap, m_destination, b); }
-    void setScrollSnapCoordinate(const Vector<LengthPoint>& b) { SET_NESTED_VAR(rareNonInheritedData, m_scrollSnap, m_coordinates, b); }
-
-    void setWillChangeProperties(const Vector<CSSPropertyID>& properties) { SET_NESTED_VAR(rareNonInheritedData, m_willChange, m_properties, properties); }
-    void setWillChangeContents(bool b) { SET_NESTED_VAR(rareNonInheritedData, m_willChange, m_contents, b); }
-    void setWillChangeScrollPosition(bool b) { SET_NESTED_VAR(rareNonInheritedData, m_willChange, m_scrollPosition, b); }
-    void setSubtreeWillChangeContents(bool b) { SET_VAR(rareInheritedData, m_subtreeWillChangeContents, b); }
-
-    bool requiresAcceleratedCompositingForExternalReasons(bool b) { return rareNonInheritedData->m_requiresAcceleratedCompositingForExternalReasons; }
-    void setRequiresAcceleratedCompositingForExternalReasons(bool b) { SET_VAR(rareNonInheritedData, m_requiresAcceleratedCompositingForExternalReasons, b); }
+    void setPerspectiveOrigin(const LengthPoint& p) { SET_VAR(m_rareNonInheritedData, m_perspectiveOrigin, p); }
+    void setPageSize(const FloatSize& s) { SET_VAR(m_rareNonInheritedData, m_pageSize, s); }
+    void setPageSizeType(PageSizeType t) { SET_VAR(m_rareNonInheritedData, m_pageSizeType, t); }
+    void resetPageSizeType() { SET_VAR(m_rareNonInheritedData, m_pageSizeType, PAGE_SIZE_AUTO); }
+
+    void setHasCurrentOpacityAnimation(bool b = true) { SET_VAR(m_rareNonInheritedData, m_hasCurrentOpacityAnimation, b); }
+    void setHasCurrentTransformAnimation(bool b = true) { SET_VAR(m_rareNonInheritedData, m_hasCurrentTransformAnimation, b); }
+    void setHasCurrentFilterAnimation(bool b = true) { SET_VAR(m_rareNonInheritedData, m_hasCurrentFilterAnimation, b); }
+    void setHasCurrentBackdropFilterAnimation(bool b = true) { SET_VAR(m_rareNonInheritedData, m_hasCurrentBackdropFilterAnimation, b); }
+
+    void setIsRunningOpacityAnimationOnCompositor(bool b = true) { SET_VAR(m_rareNonInheritedData, m_runningOpacityAnimationOnCompositor, b); }
+    void setIsRunningTransformAnimationOnCompositor(bool b = true) { SET_VAR(m_rareNonInheritedData, m_runningTransformAnimationOnCompositor, b); }
+    void setIsRunningFilterAnimationOnCompositor(bool b = true) { SET_VAR(m_rareNonInheritedData, m_runningFilterAnimationOnCompositor, b); }
+    void setIsRunningBackdropFilterAnimationOnCompositor(bool b = true) { SET_VAR(m_rareNonInheritedData, m_runningBackdropFilterAnimationOnCompositor, b); }
+
+    void setLineClamp(LineClampValue c) { SET_VAR(m_rareNonInheritedData, lineClamp, c); }
+    void setTapHighlightColor(const Color& c) { SET_VAR(m_rareInheritedData, tapHighlightColor, c); }
+    void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(m_rareInheritedData, textSecurity, aTextSecurity); }
+    void setTouchAction(TouchAction t) { SET_VAR(m_rareNonInheritedData, m_touchAction, t); }
+
+    void setScrollBehavior(ScrollBehavior b) { SET_VAR(m_rareNonInheritedData, m_scrollBehavior, b); }
+
+    void setScrollSnapType(ScrollSnapType b) { SET_VAR(m_rareNonInheritedData, m_scrollSnapType, b); }
+    void setScrollSnapPointsX(const ScrollSnapPoints& b) { SET_NESTED_VAR(m_rareNonInheritedData, m_scrollSnap, m_xPoints, b); }
+    void setScrollSnapPointsY(const ScrollSnapPoints& b) { SET_NESTED_VAR(m_rareNonInheritedData, m_scrollSnap, m_yPoints, b); }
+    void setScrollSnapDestination(const LengthPoint& b) { SET_NESTED_VAR(m_rareNonInheritedData, m_scrollSnap, m_destination, b); }
+    void setScrollSnapCoordinate(const Vector<LengthPoint>& b) { SET_NESTED_VAR(m_rareNonInheritedData, m_scrollSnap, m_coordinates, b); }
+
+    void setWillChangeProperties(const Vector<CSSPropertyID>& properties) { SET_NESTED_VAR(m_rareNonInheritedData, m_willChange, m_properties, properties); }
+    void setWillChangeContents(bool b) { SET_NESTED_VAR(m_rareNonInheritedData, m_willChange, m_contents, b); }
+    void setWillChangeScrollPosition(bool b) { SET_NESTED_VAR(m_rareNonInheritedData, m_willChange, m_scrollPosition, b); }
+    void setSubtreeWillChangeContents(bool b) { SET_VAR(m_rareInheritedData, m_subtreeWillChangeContents, b); }
+
+    bool requiresAcceleratedCompositingForExternalReasons(bool b) { return m_rareNonInheritedData->m_requiresAcceleratedCompositingForExternalReasons; }
+    void setRequiresAcceleratedCompositingForExternalReasons(bool b) { SET_VAR(m_rareNonInheritedData, m_requiresAcceleratedCompositingForExternalReasons, b); }
 
     const SVGComputedStyle& svgStyle() const { return *m_svgStyle.get(); }
     SVGComputedStyle& accessSVGStyle() { return *m_svgStyle.access(); }
 
     const SVGPaintType& fillPaintType() const { return svgStyle().fillPaintType(); }
     Color fillPaintColor() const { return svgStyle().fillPaintColor(); }
     float fillOpacity() const { return svgStyle().fillOpacity(); }
     void setFillOpacity(float f) { accessSVGStyle().setFillOpacity(f); }
 
     const SVGPaintType& strokePaintType() const { return svgStyle().strokePaintType(); }
@@ skipping 32 matching lines @@
     const Length& baselineShiftValue() const { return svgStyle().baselineShiftValue(); }
     void setBaselineShiftValue(const Length& value)
     {
         SVGComputedStyle& svgStyle = accessSVGStyle();
         svgStyle.setBaselineShift(BS_LENGTH);
         svgStyle.setBaselineShiftValue(value);
     }
 
     void setShapeOutside(ShapeValue* value)
     {
-        if (rareNonInheritedData->m_shapeOutside == value)
+        if (m_rareNonInheritedData->m_shapeOutside == value)
             return;
-        rareNonInheritedData.access()->m_shapeOutside = value;
+        m_rareNonInheritedData.access()->m_shapeOutside = value;
     }
-    ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutside.get(); }
+    ShapeValue* shapeOutside() const { return m_rareNonInheritedData->m_shapeOutside.get(); }
 
     static ShapeValue* initialShapeOutside() { return 0; }
 
     void setClipPath(PassRefPtr<ClipPathOperation> operation)
     {
-        if (rareNonInheritedData->m_clipPath != operation)
-            rareNonInheritedData.access()->m_clipPath = operation;
+        if (m_rareNonInheritedData->m_clipPath != operation)
+            m_rareNonInheritedData.access()->m_clipPath = operation;
     }
-    ClipPathOperation* clipPath() const { return rareNonInheritedData->m_clipPath.get(); }
+    ClipPathOperation* clipPath() const { return m_rareNonInheritedData->m_clipPath.get(); }
 
     static ClipPathOperation* initialClipPath() { return 0; }
 
-    const Length& shapeMargin() const { return rareNonInheritedData->m_shapeMargin; }
-    void setShapeMargin(const Length& shapeMargin) { SET_VAR(rareNonInheritedData, m_shapeMargin, shapeMargin); }
+    const Length& shapeMargin() const { return m_rareNonInheritedData->m_shapeMargin; }
+    void setShapeMargin(const Length& shapeMargin) { SET_VAR(m_rareNonInheritedData, m_shapeMargin, shapeMargin); }
     static Length initialShapeMargin() { return Length(0, Fixed); }
 
-    float shapeImageThreshold() const { return rareNonInheritedData->m_shapeImageThreshold; }
+    float shapeImageThreshold() const { return m_rareNonInheritedData->m_shapeImageThreshold; }
     void setShapeImageThreshold(float shapeImageThreshold)
     {
         float clampedShapeImageThreshold = clampTo<float>(shapeImageThreshold, 0, 1);
-        SET_VAR(rareNonInheritedData, m_shapeImageThreshold, clampedShapeImageThreshold);
+        SET_VAR(m_rareNonInheritedData, m_shapeImageThreshold, clampedShapeImageThreshold);
     }
     static float initialShapeImageThreshold() { return 0; }
 
     bool hasContent() const { return contentData(); }
-    ContentData* contentData() const { return rareNonInheritedData->m_content.get(); }
-    bool contentDataEquivalent(const ComputedStyle* otherStyle) const { return const_cast<ComputedStyle*>(this)->rareNonInheritedData->contentDataEquivalent(*const_cast<ComputedStyle*>(otherStyle)->rareNonInheritedData); }
+    ContentData* contentData() const { return m_rareNonInheritedData->m_content.get(); }
+    bool contentDataEquivalent(const ComputedStyle* otherStyle) const { return const_cast<ComputedStyle*>(this)->m_rareNonInheritedData->contentDataEquivalent(*const_cast<ComputedStyle*>(otherStyle)->m_rareNonInheritedData); }
     void setContent(ContentData*);
 
     const CounterDirectiveMap* counterDirectives() const;
     CounterDirectiveMap& accessCounterDirectives();
     const CounterDirectives getCounterDirectives(const AtomicString& identifier) const;
     void clearIncrementDirectives();
     void clearResetDirectives();
 
-    QuotesData* quotes() const { return rareInheritedData->quotes.get(); }
+    QuotesData* quotes() const { return m_rareInheritedData->quotes.get(); }
     void setQuotes(PassRefPtr<QuotesData>);
 
     const AtomicString& hyphenString() const;
 
     bool inheritedEqual(const ComputedStyle&) const;
     bool nonInheritedEqual(const ComputedStyle&) const;
     bool loadingCustomFontsEqual(const ComputedStyle&) const;
     bool inheritedDataShared(const ComputedStyle&) const;
 
     bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); }
     bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
     bool isOriginalDisplayInlineType() const { return isDisplayInlineType(originalDisplay()); }
     bool isDisplayFlexibleOrGridBox() const { return isDisplayFlexibleBox(display()) || isDisplayGridBox(display()); }
     bool isDisplayFlexibleBox() const { return isDisplayFlexibleBox(display()); }
 
 
     bool setWritingMode(WritingMode v)
     {
         if (v == getWritingMode())
             return false;
 
-        inherited_data.m_writingMode = v;
+        m_inheritedData.m_writingMode = v;
         return true;
     }
 
     // A unique style is one that has matches something that makes it impossible to share.
-    bool unique() const { return noninherited_data.m_unique; }
-    void setUnique() { noninherited_data.m_unique = true; }
+    bool unique() const { return m_nonInheritedData.m_unique; }
+    void setUnique() { m_nonInheritedData.m_unique = true; }
 
     bool isSharable() const;
 
-    bool emptyState() const { return noninherited_data.m_emptyState; }
-    void setEmptyState(bool b) { setUnique(); noninherited_data.m_emptyState = b; }
+    bool emptyState() const { return m_nonInheritedData.m_emptyState; }
+    void setEmptyState(bool b) { setUnique(); m_nonInheritedData.m_emptyState = b; }
 
     Color visitedDependentColor(int colorProperty) const;
 
-    void setHasExplicitlyInheritedProperties() { noninherited_data.m_explicitInheritance = true; }
-    bool hasExplicitlyInheritedProperties() const { return noninherited_data.m_explicitInheritance; }
+    void setHasExplicitlyInheritedProperties() { m_nonInheritedData.m_explicitInheritance = true; }
+    bool hasExplicitlyInheritedProperties() const { return m_nonInheritedData.m_explicitInheritance; }
 
-    void setHasVariableReferenceFromNonInheritedProperty() { noninherited_data.m_variableReference = true; }
-    bool hasVariableReferenceFromNonInheritedProperty() const { return noninherited_data.m_variableReference; }
+    void setHasVariableReferenceFromNonInheritedProperty() { m_nonInheritedData.m_variableReference = true; }
+    bool hasVariableReferenceFromNonInheritedProperty() const { return m_nonInheritedData.m_variableReference; }
 
     bool hasChildDependentFlags() const { return emptyState() || hasExplicitlyInheritedProperties(); }
     void copyChildDependentFlagsFrom(const ComputedStyle&);
 
     bool hasBoxDecorations() const
     {
         return hasBorderDecoration()
             || hasBorderRadius()
             || hasOutline()
             || hasAppearance()
             || boxShadow()
             || hasFilterInducingProperty()
             || hasBackdropFilter()
             || resize() != RESIZE_NONE;
     }
 
     bool borderObscuresBackground() const;
     void getBorderEdgeInfo(BorderEdge edges[], bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
 
-    void setHasAuthorBackground(bool authorBackground) { SET_VAR(rareNonInheritedData, m_hasAuthorBackground, authorBackground); }
-    void setHasAuthorBorder(bool authorBorder) { SET_VAR(rareNonInheritedData, m_hasAuthorBorder, authorBorder); }
-    bool hasAuthorBackground() const { return rareNonInheritedData->m_hasAuthorBackground; };
-    bool hasAuthorBorder() const { return rareNonInheritedData->m_hasAuthorBorder; };
+    void setHasAuthorBackground(bool authorBackground) { SET_VAR(m_rareNonInheritedData, m_hasAuthorBackground, authorBackground); }
+    void setHasAuthorBorder(bool authorBorder) { SET_VAR(m_rareNonInheritedData, m_hasAuthorBorder, authorBorder); }
+    bool hasAuthorBackground() const { return m_rareNonInheritedData->m_hasAuthorBackground; };
+    bool hasAuthorBorder() const { return m_rareNonInheritedData->m_hasAuthorBorder; };
 
     void addPaintImage(StyleImage*);
 
     // Initial values for all the properties
     static EBorderCollapse initialBorderCollapse() { return BorderCollapseSeparate; }
     static EBorderStyle initialBorderStyle() { return BorderStyleNone; }
     static OutlineIsAuto initialOutlineStyleIsAuto() { return OutlineIsAutoOff; }
     static NinePieceImage initialNinePieceImage() { return NinePieceImage(); }
     static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed), Length(0, Fixed)); }
     static ECaptionSide initialCaptionSide() { return CaptionSideTop; }
@@ skipping 179 matching lines @@
     // FIXME: Why? Seems these should all be one big sorted list.
     static LineClampValue initialLineClamp() { return LineClampValue(); }
     static ETextSecurity initialTextSecurity() { return TSNONE; }
     static Color initialTapHighlightColor();
     static const FilterOperations& initialFilter();
     static const FilterOperations& initialBackdropFilter();
     static WebBlendMode initialBlendMode() { return WebBlendModeNormal; }
     static EIsolation initialIsolation() { return IsolationAuto; }
 private:
     void setVisitedLinkColor(const Color&);
-    void setVisitedLinkBackgroundColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBackgroundColor, v); }
-    void setVisitedLinkBorderLeftColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderLeftColor, v); }
-    void setVisitedLinkBorderRightColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderRightColor, v); }
-    void setVisitedLinkBorderBottomColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderBottomColor, v); }
-    void setVisitedLinkBorderTopColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderTopColor, v); }
-    void setVisitedLinkOutlineColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkOutlineColor, v); }
-    void setVisitedLinkColumnRuleColor(const StyleColor& v) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_visitedLinkColumnRuleColor, v); }
-    void setVisitedLinkTextDecorationColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkTextDecorationColor, v); }
-    void setVisitedLinkTextEmphasisColor(const StyleColor& v) { SET_VAR_WITH_SETTER(rareInheritedData, visitedLinkTextEmphasisColor, setVisitedLinkTextEmphasisColor, v); }
-    void setVisitedLinkTextFillColor(const StyleColor& v) { SET_VAR_WITH_SETTER(rareInheritedData, visitedLinkTextFillColor, setVisitedLinkTextFillColor, v); }
-    void setVisitedLinkTextStrokeColor(const StyleColor& v) { SET_VAR_WITH_SETTER(rareInheritedData, visitedLinkTextStrokeColor, setVisitedLinkTextStrokeColor, v); }
+    void setVisitedLinkBackgroundColor(const StyleColor& v) { SET_VAR(m_rareNonInheritedData, m_visitedLinkBackgroundColor, v); }
+    void setVisitedLinkBorderLeftColor(const StyleColor& v) { SET_VAR(m_rareNonInheritedData, m_visitedLinkBorderLeftColor, v); }
+    void setVisitedLinkBorderRightColor(const StyleColor& v) { SET_VAR(m_rareNonInheritedData, m_visitedLinkBorderRightColor, v); }
+    void setVisitedLinkBorderBottomColor(const StyleColor& v) { SET_VAR(m_rareNonInheritedData, m_visitedLinkBorderBottomColor, v); }
+    void setVisitedLinkBorderTopColor(const StyleColor& v) { SET_VAR(m_rareNonInheritedData, m_visitedLinkBorderTopColor, v); }
+    void setVisitedLinkOutlineColor(const StyleColor& v) { SET_VAR(m_rareNonInheritedData, m_visitedLinkOutlineColor, v); }
+    void setVisitedLinkColumnRuleColor(const StyleColor& v) { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_visitedLinkColumnRuleColor, v); }
+    void setVisitedLinkTextDecorationColor(const StyleColor& v) { SET_VAR(m_rareNonInheritedData, m_visitedLinkTextDecorationColor, v); }
+    void setVisitedLinkTextEmphasisColor(const StyleColor& v) { SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextEmphasisColor, setVisitedLinkTextEmphasisColor, v); }
+    void setVisitedLinkTextFillColor(const StyleColor& v) { SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextFillColor, setVisitedLinkTextFillColor, v); }
+    void setVisitedLinkTextStrokeColor(const StyleColor& v) { SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextStrokeColor, setVisitedLinkTextStrokeColor, v); }
 
-    void inheritUnicodeBidiFrom(const ComputedStyle& parent) { noninherited_data.m_unicodeBidi = parent.noninherited_data.m_unicodeBidi; }
+    void inheritUnicodeBidiFrom(const ComputedStyle& parent) { m_nonInheritedData.m_unicodeBidi = parent.m_nonInheritedData.m_unicodeBidi; }
 
     bool isDisplayFlexibleBox(EDisplay display) const
     {
         return display == FLEX || display == INLINE_FLEX;
     }
 
     bool isDisplayGridBox(EDisplay display) const
     {
         return display == GRID || display == INLINE_GRID;
     }
 
     bool isDisplayReplacedType(EDisplay display) const
     {
         return display == INLINE_BLOCK || display == INLINE_BOX || display == INLINE_FLEX
             || display == INLINE_TABLE || display == INLINE_GRID;
     }
 
     bool isDisplayInlineType(EDisplay display) const
     {
         return display == INLINE || isDisplayReplacedType(display);
     }
 
     // Color accessors are all private to make sure callers use visitedDependentColor instead to access them.
-    StyleColor borderLeftColor() const { return surround->border.left().color(); }
-    StyleColor borderRightColor() const { return surround->border.right().color(); }
-    StyleColor borderTopColor() const { return surround->border.top().color(); }
-    StyleColor borderBottomColor() const { return surround->border.bottom().color(); }
+    StyleColor borderLeftColor() const { return m_surround->border.left().color(); }
+    StyleColor borderRightColor() const { return m_surround->border.right().color(); }
+    StyleColor borderTopColor() const { return m_surround->border.top().color(); }
+    StyleColor borderBottomColor() const { return m_surround->border.bottom().color(); }
     StyleColor backgroundColor() const { return m_background->color(); }
     Color color() const;
-    StyleColor columnRuleColor() const { return rareNonInheritedData->m_multiCol->m_rule.color(); }
+    StyleColor columnRuleColor() const { return m_rareNonInheritedData->m_multiCol->m_rule.color(); }
     StyleColor outlineColor() const { return m_background->outline().color(); }
-    StyleColor textEmphasisColor() const { return rareInheritedData->textEmphasisColor(); }
-    StyleColor textFillColor() const { return rareInheritedData->textFillColor(); }
-    StyleColor textStrokeColor() const { return rareInheritedData->textStrokeColor(); }
+    StyleColor textEmphasisColor() const { return m_rareInheritedData->textEmphasisColor(); }
+    StyleColor textFillColor() const { return m_rareInheritedData->textFillColor(); }
+    StyleColor textStrokeColor() const { return m_rareInheritedData->textStrokeColor(); }
     Color visitedLinkColor() const;
-    StyleColor visitedLinkBackgroundColor() const { return rareNonInheritedData->m_visitedLinkBackgroundColor; }
-    StyleColor visitedLinkBorderLeftColor() const { return rareNonInheritedData->m_visitedLinkBorderLeftColor; }
-    StyleColor visitedLinkBorderRightColor() const { return rareNonInheritedData->m_visitedLinkBorderRightColor; }
-    StyleColor visitedLinkBorderBottomColor() const { return rareNonInheritedData->m_visitedLinkBorderBottomColor; }
-    StyleColor visitedLinkBorderTopColor() const { return rareNonInheritedData->m_visitedLinkBorderTopColor; }
-    StyleColor visitedLinkOutlineColor() const { return rareNonInheritedData->m_visitedLinkOutlineColor; }
-    StyleColor visitedLinkColumnRuleColor() const { return rareNonInheritedData->m_multiCol->m_visitedLinkColumnRuleColor; }
-    StyleColor textDecorationColor() const { return rareNonInheritedData->m_textDecorationColor; }
-    StyleColor visitedLinkTextDecorationColor() const { return rareNonInheritedData->m_visitedLinkTextDecorationColor; }
-    StyleColor visitedLinkTextEmphasisColor() const { return rareInheritedData->visitedLinkTextEmphasisColor(); }
-    StyleColor visitedLinkTextFillColor() const { return rareInheritedData->visitedLinkTextFillColor(); }
-    StyleColor visitedLinkTextStrokeColor() const { return rareInheritedData->visitedLinkTextStrokeColor(); }
+    StyleColor visitedLinkBackgroundColor() const { return m_rareNonInheritedData->m_visitedLinkBackgroundColor; }
+    StyleColor visitedLinkBorderLeftColor() const { return m_rareNonInheritedData->m_visitedLinkBorderLeftColor; }
+    StyleColor visitedLinkBorderRightColor() const { return m_rareNonInheritedData->m_visitedLinkBorderRightColor; }
+    StyleColor visitedLinkBorderBottomColor() const { return m_rareNonInheritedData->m_visitedLinkBorderBottomColor; }
+    StyleColor visitedLinkBorderTopColor() const { return m_rareNonInheritedData->m_visitedLinkBorderTopColor; }
+    StyleColor visitedLinkOutlineColor() const { return m_rareNonInheritedData->m_visitedLinkOutlineColor; }
+    StyleColor visitedLinkColumnRuleColor() const { return m_rareNonInheritedData->m_multiCol->m_visitedLinkColumnRuleColor; }
+    StyleColor textDecorationColor() const { return m_rareNonInheritedData->m_textDecorationColor; }
+    StyleColor visitedLinkTextDecorationColor() const { return m_rareNonInheritedData->m_visitedLinkTextDecorationColor; }
+    StyleColor visitedLinkTextEmphasisColor() const { return m_rareInheritedData->visitedLinkTextEmphasisColor(); }
+    StyleColor visitedLinkTextFillColor() const { return m_rareInheritedData->visitedLinkTextFillColor(); }
+    StyleColor visitedLinkTextStrokeColor() const { return m_rareInheritedData->visitedLinkTextStrokeColor(); }
 
     StyleColor decorationColorIncludingFallback(bool visitedLink) const;
     Color colorIncludingFallback(int colorProperty, bool visitedLink) const;
 
     Color stopColor() const { return svgStyle().stopColor(); }
     Color floodColor() const { return svgStyle().floodColor(); }
     Color lightingColor() const { return svgStyle().lightingColor(); }
 
     void addAppliedTextDecoration(const AppliedTextDecoration&);
     void applyMotionPathTransform(float originX, float originY, TransformationMatrix&) const;
@@ skipping 41 matching lines @@
     return scrollOffset / zoomFactor;
 }
 
 inline double adjustScrollForAbsoluteZoom(double scrollOffset, const ComputedStyle& style)
 {
     return adjustScrollForAbsoluteZoom(scrollOffset, style.effectiveZoom());
 }
 
 inline bool ComputedStyle::setZoom(float f)
 {
-    if (compareEqual(visual->m_zoom, f))
+    if (compareEqual(m_visual->m_zoom, f))
         return false;
-    visual.access()->m_zoom = f;
+    m_visual.access()->m_zoom = f;
     setEffectiveZoom(effectiveZoom() * zoom());
     return true;
 }
 
 inline bool ComputedStyle::setEffectiveZoom(float f)
 {
     // Clamp the effective zoom value to a smaller (but hopeful still large
     // enough) range, to avoid overflow in derived computations.
     float clampedEffectiveZoom = clampTo<float>(f, 1e-6, 1e6);
-    if (compareEqual(rareInheritedData->m_effectiveZoom, clampedEffectiveZoom))
+    if (compareEqual(m_rareInheritedData->m_effectiveZoom, clampedEffectiveZoom))
         return false;
-    rareInheritedData.access()->m_effectiveZoom = clampedEffectiveZoom;
+    m_rareInheritedData.access()->m_effectiveZoom = clampedEffectiveZoom;
     return true;
 }
 
 inline bool ComputedStyle::isSharable() const
 {
     if (unique())
         return false;
     if (hasUniquePseudoStyle())
         return false;
     return true;
 }
 
 inline bool ComputedStyle::setTextOrientation(TextOrientation textOrientation)
 {
-    if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
+    if (compareEqual(m_rareInheritedData->m_textOrientation, textOrientation))
         return false;
 
-    rareInheritedData.access()->m_textOrientation = textOrientation;
+    m_rareInheritedData.access()->m_textOrientation = textOrientation;
     return true;
 }
 
 inline bool ComputedStyle::hasAnyPublicPseudoStyles() const
 {
-    return PublicPseudoIdMask & noninherited_data.m_pseudoBits;
+    return PublicPseudoIdMask & m_nonInheritedData.m_pseudoBits;
 }
 
 inline bool ComputedStyle::hasPseudoStyle(PseudoId pseudo) const
 {
     ASSERT(pseudo > PseudoIdNone);
     ASSERT(pseudo < FirstInternalPseudoId);
-    return (1 << (pseudo - 1)) & noninherited_data.m_pseudoBits;
+    return (1 << (pseudo - 1)) & m_nonInheritedData.m_pseudoBits;
 }
 
 inline void ComputedStyle::setHasPseudoStyle(PseudoId pseudo)
 {
     ASSERT(pseudo > PseudoIdNone);
     ASSERT(pseudo < FirstInternalPseudoId);
-    noninherited_data.m_pseudoBits |= 1 << (pseudo - 1);
+    m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const
 {
-    return noninherited_data.m_pseudoBits & ElementPseudoIdMask;
+    return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 } // namespace blink
 
 #endif // ComputedStyle_h