| Index: Source/core/layout/LayoutRubyText.cpp
|
| diff --git a/Source/core/layout/LayoutRubyText.cpp b/Source/core/layout/LayoutRubyText.cpp
|
| index 1f0c1bc9e5d34b785d45a29c6522a1ec5d7a08bc..10604426bd08dc4a102228c044efe1268f9e90a4 100644
|
| --- a/Source/core/layout/LayoutRubyText.cpp
|
| +++ b/Source/core/layout/LayoutRubyText.cpp
|
| @@ -44,7 +44,7 @@ LayoutRubyText::~LayoutRubyText()
|
| {
|
| }
|
|
|
| -bool LayoutRubyText::isChildAllowed(LayoutObject* child, const LayoutStyle&) const
|
| +bool LayoutRubyText::isChildAllowed(LayoutObject* child, const ComputedStyle&) const
|
| {
|
| return child->isInline();
|
| }
|
| @@ -53,7 +53,7 @@ ETextAlign LayoutRubyText::textAlignmentForLine(bool endsWithSoftBreak) const
|
| {
|
| ETextAlign textAlign = style()->textAlign();
|
| // FIXME: This check is bogus since user can set the initial value.
|
| - if (textAlign != LayoutStyle::initialTextAlign())
|
| + if (textAlign != ComputedStyle::initialTextAlign())
|
| return LayoutBlockFlow::textAlignmentForLine(endsWithSoftBreak);
|
|
|
| // The default behavior is to allow ruby text to expand if it is shorter than the ruby base.
|
| @@ -64,7 +64,7 @@ void LayoutRubyText::adjustInlineDirectionLineBounds(unsigned expansionOpportuni
|
| {
|
| ETextAlign textAlign = style()->textAlign();
|
| // FIXME: This check is bogus since user can set the initial value.
|
| - if (textAlign != LayoutStyle::initialTextAlign())
|
| + if (textAlign != ComputedStyle::initialTextAlign())
|
| return LayoutBlockFlow::adjustInlineDirectionLineBounds(expansionOpportunityCount, logicalLeft, logicalWidth);
|
|
|
| int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth();
|
|
|