Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1222)

Unified Diff: Source/core/layout/LayoutRubyText.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutRubyText.h ('k') | Source/core/layout/LayoutScrollbar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « Source/core/layout/LayoutRubyText.h ('k') | Source/core/layout/LayoutScrollbar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698