| Index: sky/engine/core/rendering/style/RenderStyle.h
|
| diff --git a/sky/engine/core/rendering/style/RenderStyle.h b/sky/engine/core/rendering/style/RenderStyle.h
|
| index a7856e7f665d5a22f3fddf3d2e74d05b6af28d20..c62bc9fcbe2f3432053bc74f7a28d884ad273a3d 100644
|
| --- a/sky/engine/core/rendering/style/RenderStyle.h
|
| +++ b/sky/engine/core/rendering/style/RenderStyle.h
|
| @@ -598,9 +598,7 @@ public:
|
| bool isLink() const { return noninherited_flags.isLink; }
|
|
|
| short widows() const { return rareInheritedData->widows; }
|
| - short orphans() const { return rareInheritedData->orphans; }
|
| bool hasAutoWidows() const { return rareInheritedData->m_hasAutoWidows; }
|
| - bool hasAutoOrphans() const { return rareInheritedData->m_hasAutoOrphans; }
|
| EPageBreak pageBreakInside() const { return static_cast<EPageBreak>(noninherited_flags.pageBreakInside); }
|
| EPageBreak pageBreakBefore() const { return static_cast<EPageBreak>(noninherited_flags.pageBreakBefore); }
|
| EPageBreak pageBreakAfter() const { return static_cast<EPageBreak>(noninherited_flags.pageBreakAfter); }
|
| @@ -944,9 +942,6 @@ public:
|
| void setHasAutoWidows() { SET_VAR(rareInheritedData, m_hasAutoWidows, true); SET_VAR(rareInheritedData, widows, initialWidows()); }
|
| void setWidows(short w) { SET_VAR(rareInheritedData, m_hasAutoWidows, false); SET_VAR(rareInheritedData, widows, w); }
|
|
|
| - void setHasAutoOrphans() { SET_VAR(rareInheritedData, m_hasAutoOrphans, true); SET_VAR(rareInheritedData, orphans, initialOrphans()); }
|
| - void setOrphans(short o) { SET_VAR(rareInheritedData, m_hasAutoOrphans, false); SET_VAR(rareInheritedData, orphans, o); }
|
| -
|
| // For valid values of page-break-inside see http://www.w3.org/TR/CSS21/page.html#page-break-props
|
| void setPageBreakInside(EPageBreak b) { ASSERT(b == PBAUTO || b == PBAVOID); noninherited_flags.pageBreakInside = b; }
|
| void setPageBreakBefore(EPageBreak b) { noninherited_flags.pageBreakBefore = b; }
|
| @@ -1143,7 +1138,6 @@ public:
|
| static TextIndentType initialTextIndentType() { return TextIndentNormal; }
|
| static EVerticalAlign initialVerticalAlign() { return BASELINE; }
|
| static short initialWidows() { return 2; }
|
| - static short initialOrphans() { return 2; }
|
| static Length initialLineHeight() { return Length(-100.0, Percent); }
|
| static ETextAlign initialTextAlign() { return TASTART; }
|
| static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
|
|
|