| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 8a62592572d1654868376d7ca93ec2b5f58e7344..98453c5956a2c9e28da1cf8dc76783e6b47a4576 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -546,11 +546,11 @@ public:
|
| TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(rareInheritedData->m_textIndentLine); }
|
| #endif
|
| ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flags._text_align); }
|
| + TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rareInheritedData->m_textAlignLast); }
|
| ETextTransform textTransform() const { return static_cast<ETextTransform>(inherited_flags._text_transform); }
|
| TextDecoration textDecorationsInEffect() const { return static_cast<TextDecoration>(inherited_flags._text_decorations); }
|
| TextDecoration textDecoration() const { return static_cast<TextDecoration>(visual->textDecoration); }
|
| #if ENABLE(CSS3_TEXT)
|
| - TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rareInheritedData->m_textAlignLast); }
|
| TextUnderlinePosition textUnderlinePosition() const { return static_cast<TextUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); }
|
| #endif // CSS3_TEXT
|
| TextDecorationStyle textDecorationStyle() const { return static_cast<TextDecorationStyle>(rareNonInheritedData->m_textDecorationStyle); }
|
| @@ -1054,12 +1054,12 @@ public:
|
| void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_textIndentLine, v); }
|
| #endif
|
| void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }
|
| + void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); }
|
| void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; }
|
| void addToTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_decorations |= v; }
|
| void setTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_decorations = v; }
|
| void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v); }
|
| #if ENABLE(CSS3_TEXT)
|
| - void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); }
|
| void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInheritedData, m_textUnderlinePosition, v); }
|
| #endif // CSS3_TEXT
|
| void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInheritedData, m_textDecorationStyle, v); }
|
| @@ -1512,9 +1512,9 @@ public:
|
| static short initialOrphans() { return 2; }
|
| static Length initialLineHeight() { return Length(-100.0, Percent); }
|
| static ETextAlign initialTextAlign() { return TASTART; }
|
| + static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
|
| static TextDecoration initialTextDecoration() { return TextDecorationNone; }
|
| #if ENABLE(CSS3_TEXT)
|
| - static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
|
| static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnderlinePositionAuto; }
|
| #endif // CSS3_TEXT
|
| static TextDecorationStyle initialTextDecorationStyle() { return TextDecorationStyleSolid; }
|
|
|