| Index: Source/core/rendering/style/StyleMultiColData.cpp
|
| diff --git a/Source/core/rendering/style/StyleMultiColData.cpp b/Source/core/rendering/style/StyleMultiColData.cpp
|
| index 9a4eb5ff3f1aaadefc925601a0fe18b88ca3bde9..90897bb28bfe53a1ec31ccb9661168a94a29380b 100644
|
| --- a/Source/core/rendering/style/StyleMultiColData.cpp
|
| +++ b/Source/core/rendering/style/StyleMultiColData.cpp
|
| @@ -33,6 +33,7 @@ StyleMultiColData::StyleMultiColData()
|
| , m_autoWidth(true)
|
| , m_autoCount(true)
|
| , m_normalGap(true)
|
| + , m_fill(RenderStyle::initialColumnFill())
|
| , m_columnSpan(false)
|
| , m_breakBefore(RenderStyle::initialPageBreak())
|
| , m_breakAfter(RenderStyle::initialPageBreak())
|
| @@ -52,6 +53,7 @@ StyleMultiColData::StyleMultiColData(const StyleMultiColData& o)
|
| , m_autoWidth(o.m_autoWidth)
|
| , m_autoCount(o.m_autoCount)
|
| , m_normalGap(o.m_normalGap)
|
| + , m_fill(o.m_fill)
|
| , m_columnSpan(o.m_columnSpan)
|
| , m_breakBefore(o.m_breakBefore)
|
| , m_breakAfter(o.m_breakAfter)
|
| @@ -64,10 +66,11 @@ StyleMultiColData::StyleMultiColData(const StyleMultiColData& o)
|
| bool StyleMultiColData::operator==(const StyleMultiColData& o) const
|
| {
|
| return m_width == o.m_width && m_count == o.m_count && m_gap == o.m_gap
|
| - && m_rule == o.m_rule && m_visitedLinkColumnRuleColor == o.m_visitedLinkColumnRuleColor && m_breakBefore == o.m_breakBefore
|
| - && m_autoWidth == o.m_autoWidth && m_autoCount == o.m_autoCount && m_normalGap == o.m_normalGap
|
| - && m_columnSpan == o.m_columnSpan && m_breakAfter == o.m_breakAfter && m_breakInside == o.m_breakInside && m_axis == o.m_axis
|
| - && m_progression == o.m_progression;
|
| + && m_rule == o.m_rule && m_visitedLinkColumnRuleColor == o.m_visitedLinkColumnRuleColor && m_breakBefore == o.m_breakBefore
|
| + && m_autoWidth == o.m_autoWidth && m_autoCount == o.m_autoCount && m_normalGap == o.m_normalGap
|
| + && m_fill == o.m_fill && m_columnSpan == o.m_columnSpan
|
| + && m_breakAfter == o.m_breakAfter && m_breakInside == o.m_breakInside
|
| + && m_axis == o.m_axis && m_progression == o.m_progression;
|
| }
|
|
|
| } // namespace WebCore
|
|
|