diff options
Diffstat (limited to 'WebCore/rendering/style/StyleRareNonInheritedData.cpp')
| -rw-r--r-- | WebCore/rendering/style/StyleRareNonInheritedData.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/rendering/style/StyleRareNonInheritedData.cpp b/WebCore/rendering/style/StyleRareNonInheritedData.cpp index e293984..e0f7f7a 100644 --- a/WebCore/rendering/style/StyleRareNonInheritedData.cpp +++ b/WebCore/rendering/style/StyleRareNonInheritedData.cpp @@ -37,8 +37,8 @@ StyleRareNonInheritedData::StyleRareNonInheritedData() , m_counterDirectives(0) , userDrag(RenderStyle::initialUserDrag()) , textOverflow(RenderStyle::initialTextOverflow()) - , marginTopCollapse(MCOLLAPSE) - , marginBottomCollapse(MCOLLAPSE) + , marginBeforeCollapse(MCOLLAPSE) + , marginAfterCollapse(MCOLLAPSE) , matchNearestMailBlockquoteColor(RenderStyle::initialMatchNearestMailBlockquoteColor()) , m_appearance(RenderStyle::initialAppearance()) , m_borderFit(RenderStyle::initialBorderFit()) @@ -73,8 +73,8 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited , m_counterDirectives(0) , userDrag(o.userDrag) , textOverflow(o.textOverflow) - , marginTopCollapse(o.marginTopCollapse) - , marginBottomCollapse(o.marginBottomCollapse) + , marginBeforeCollapse(o.marginBeforeCollapse) + , marginAfterCollapse(o.marginAfterCollapse) , matchNearestMailBlockquoteColor(o.matchNearestMailBlockquoteColor) , m_appearance(o.m_appearance) , m_borderFit(o.m_borderFit) @@ -118,8 +118,8 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c && m_counterDirectives == o.m_counterDirectives && userDrag == o.userDrag && textOverflow == o.textOverflow - && marginTopCollapse == o.marginTopCollapse - && marginBottomCollapse == o.marginBottomCollapse + && marginBeforeCollapse == o.marginBeforeCollapse + && marginAfterCollapse == o.marginAfterCollapse && matchNearestMailBlockquoteColor == o.matchNearestMailBlockquoteColor && m_appearance == o.m_appearance && m_borderFit == o.m_borderFit |