| Index: sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
|
| diff --git a/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp b/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
|
| index eff59d61b69997bd4c44300bfeb95d0e85f5dc3b..3f086037f1e881a5dbd7a9e58391a22bafe3633d 100644
|
| --- a/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
|
| +++ b/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
|
| @@ -62,7 +62,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
|
| , marginBeforeCollapse(MCOLLAPSE)
|
| , marginAfterCollapse(MCOLLAPSE)
|
| , m_borderFit(RenderStyle::initialBorderFit())
|
| - , m_textCombine(RenderStyle::initialTextCombine())
|
| , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
|
| , m_wrapFlow(RenderStyle::initialWrapFlow())
|
| , m_wrapThrough(RenderStyle::initialWrapThrough())
|
| @@ -133,7 +132,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
|
| , marginBeforeCollapse(o.marginBeforeCollapse)
|
| , marginAfterCollapse(o.marginAfterCollapse)
|
| , m_borderFit(o.m_borderFit)
|
| - , m_textCombine(o.m_textCombine)
|
| , m_textDecorationStyle(o.m_textDecorationStyle)
|
| , m_wrapFlow(o.m_wrapFlow)
|
| , m_wrapThrough(o.m_wrapThrough)
|
| @@ -207,7 +205,6 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
|
| && marginBeforeCollapse == o.marginBeforeCollapse
|
| && marginAfterCollapse == o.marginAfterCollapse
|
| && m_borderFit == o.m_borderFit
|
| - && m_textCombine == o.m_textCombine
|
| && m_textDecorationStyle == o.m_textDecorationStyle
|
| && m_wrapFlow == o.m_wrapFlow
|
| && m_wrapThrough == o.m_wrapThrough
|
|
|