| Index: sky/engine/core/rendering/style/StyleRareInheritedData.cpp
|
| diff --git a/sky/engine/core/rendering/style/StyleRareInheritedData.cpp b/sky/engine/core/rendering/style/StyleRareInheritedData.cpp
|
| index 53375092b7c9f746e65fcbcaa1b26501c72229dc..c16d2deab55c2da14d6c0a03d4948c4dd75d6d57 100644
|
| --- a/sky/engine/core/rendering/style/StyleRareInheritedData.cpp
|
| +++ b/sky/engine/core/rendering/style/StyleRareInheritedData.cpp
|
| @@ -43,8 +43,8 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI
|
| void* refPtrs[3];
|
| Length lengths[1];
|
| unsigned m_bitfields[2];
|
| - short pagedMediaShorts[2];
|
| unsigned unsigneds[1];
|
| + short pagedMediaShorts[1];
|
| short hyphenationShorts[3];
|
|
|
| Color touchColors;
|
| @@ -56,10 +56,6 @@ StyleRareInheritedData::StyleRareInheritedData()
|
| : listStyleImage(RenderStyle::initialListStyleImage())
|
| , textStrokeWidth(RenderStyle::initialTextStrokeWidth())
|
| , indent(RenderStyle::initialTextIndent())
|
| - , widows(RenderStyle::initialWidows())
|
| - , orphans(RenderStyle::initialOrphans())
|
| - , m_hasAutoWidows(true)
|
| - , m_hasAutoOrphans(true)
|
| , m_textStrokeColorIsCurrentColor(true)
|
| , m_textFillColorIsCurrentColor(true)
|
| , m_textEmphasisColorIsCurrentColor(true)
|
| @@ -83,6 +79,8 @@ StyleRareInheritedData::StyleRareInheritedData()
|
| , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())
|
| , m_touchActionDelay(RenderStyle::initialTouchActionDelay())
|
| , m_subtreeWillChangeContents(false)
|
| + , m_hasAutoWidows(true)
|
| + , widows(RenderStyle::initialWidows())
|
| , hyphenationLimitBefore(-1)
|
| , hyphenationLimitAfter(-1)
|
| , hyphenationLimitLines(-1)
|
| @@ -102,10 +100,6 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
|
| , highlight(o.highlight)
|
| , cursorData(o.cursorData)
|
| , indent(o.indent)
|
| - , widows(o.widows)
|
| - , orphans(o.orphans)
|
| - , m_hasAutoWidows(o.m_hasAutoWidows)
|
| - , m_hasAutoOrphans(o.m_hasAutoOrphans)
|
| , m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor)
|
| , m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor)
|
| , m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor)
|
| @@ -129,10 +123,12 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
|
| , m_textUnderlinePosition(o.m_textUnderlinePosition)
|
| , m_touchActionDelay(o.m_touchActionDelay)
|
| , m_subtreeWillChangeContents(o.m_subtreeWillChangeContents)
|
| - , hyphenationString(o.hyphenationString)
|
| + , m_hasAutoWidows(o.m_hasAutoWidows)
|
| + , widows(o.widows)
|
| , hyphenationLimitBefore(o.hyphenationLimitBefore)
|
| , hyphenationLimitAfter(o.hyphenationLimitAfter)
|
| , hyphenationLimitLines(o.hyphenationLimitLines)
|
| + , hyphenationString(o.hyphenationString)
|
| , locale(o.locale)
|
| , textEmphasisCustomMark(o.textEmphasisCustomMark)
|
| , m_tabSize(o.m_tabSize)
|
| @@ -157,9 +153,7 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
|
| && dataEquivalent(cursorData.get(), o.cursorData.get())
|
| && indent == o.indent
|
| && widows == o.widows
|
| - && orphans == o.orphans
|
| && m_hasAutoWidows == o.m_hasAutoWidows
|
| - && m_hasAutoOrphans == o.m_hasAutoOrphans
|
| && m_textStrokeColorIsCurrentColor == o.m_textStrokeColorIsCurrentColor
|
| && m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor
|
| && m_textEmphasisColorIsCurrentColor == o.m_textEmphasisColorIsCurrentColor
|
|
|