| Index: Source/core/rendering/style/StyleRareNonInheritedData.cpp
|
| diff --git a/Source/core/rendering/style/StyleRareNonInheritedData.cpp b/Source/core/rendering/style/StyleRareNonInheritedData.cpp
|
| index f358fa8f063dad5b30d3723671b01ea935786359..77603265880ef7db1bfe5224bb53f13e96252dbb 100644
|
| --- a/Source/core/rendering/style/StyleRareNonInheritedData.cpp
|
| +++ b/Source/core/rendering/style/StyleRareNonInheritedData.cpp
|
| @@ -75,9 +75,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
|
| , m_appearance(RenderStyle::initialAppearance())
|
| , m_borderFit(RenderStyle::initialBorderFit())
|
| , m_textCombine(RenderStyle::initialTextCombine())
|
| -#if ENABLE(CSS3_TEXT)
|
| , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
|
| -#endif // CSS3_TEXT
|
| , m_wrapFlow(RenderStyle::initialWrapFlow())
|
| , m_wrapThrough(RenderStyle::initialWrapThrough())
|
| , m_runningAcceleratedAnimation(false)
|
| @@ -119,10 +117,8 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
|
| , m_shapeMargin(o.m_shapeMargin)
|
| , m_shapePadding(o.m_shapePadding)
|
| , m_clipPath(o.m_clipPath)
|
| -#if ENABLE(CSS3_TEXT)
|
| , m_textDecorationColor(o.m_textDecorationColor)
|
| , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor)
|
| -#endif // CSS3_TEXT
|
| , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor)
|
| , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor)
|
| , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor)
|
| @@ -150,9 +146,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
|
| , m_appearance(o.m_appearance)
|
| , m_borderFit(o.m_borderFit)
|
| , m_textCombine(o.m_textCombine)
|
| -#if ENABLE(CSS3_TEXT)
|
| , m_textDecorationStyle(o.m_textDecorationStyle)
|
| -#endif // CSS3_TEXT
|
| , m_wrapFlow(o.m_wrapFlow)
|
| , m_wrapThrough(o.m_wrapThrough)
|
| , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
|
| @@ -197,10 +191,8 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
|
| && m_shapeMargin == o.m_shapeMargin
|
| && m_shapePadding == o.m_shapePadding
|
| && m_clipPath == o.m_clipPath
|
| -#if ENABLE(CSS3_TEXT)
|
| && m_textDecorationColor == o.m_textDecorationColor
|
| && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColor
|
| -#endif // CSS3_TEXT
|
| && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor
|
| && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor
|
| && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor
|
| @@ -228,9 +220,7 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
|
| && m_appearance == o.m_appearance
|
| && m_borderFit == o.m_borderFit
|
| && m_textCombine == o.m_textCombine
|
| -#if ENABLE(CSS3_TEXT)
|
| && m_textDecorationStyle == o.m_textDecorationStyle
|
| -#endif // CSS3_TEXT
|
| && m_wrapFlow == o.m_wrapFlow
|
| && m_wrapThrough == o.m_wrapThrough
|
| && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
|
|
|