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

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

Issue 1043643002: Switch line layout to LayoutUnit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: More TestExpectations tweaks Created 5 years, 7 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/LayoutText.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 10604426bd08dc4a102228c044efe1268f9e90a4..5e50643a07d5e8c7f7904405e0412681aa75860e 100644
--- a/Source/core/layout/LayoutRubyText.cpp
+++ b/Source/core/layout/LayoutRubyText.cpp
@@ -60,7 +60,7 @@ ETextAlign LayoutRubyText::textAlignmentForLine(bool endsWithSoftBreak) const
return JUSTIFY;
}
-void LayoutRubyText::adjustInlineDirectionLineBounds(unsigned expansionOpportunityCount, float& logicalLeft, float& logicalWidth) const
+void LayoutRubyText::adjustInlineDirectionLineBounds(unsigned expansionOpportunityCount, LayoutUnit& logicalLeft, LayoutUnit& logicalWidth) const
{
ETextAlign textAlign = style()->textAlign();
// FIXME: This check is bogus since user can set the initial value.
@@ -73,9 +73,9 @@ void LayoutRubyText::adjustInlineDirectionLineBounds(unsigned expansionOpportuni
// Inset the ruby text by half the inter-ideograph expansion amount, but no more than a full-width
// ruby character on each side.
- float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportunityCount + 1);
+ LayoutUnit inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportunityCount + 1);
if (expansionOpportunityCount)
- inset = std::min<float>(2 * style()->fontSize(), inset);
+ inset = std::min(LayoutUnit(2 * style()->fontSize()), inset);
logicalLeft += inset / 2;
logicalWidth -= inset;
« no previous file with comments | « Source/core/layout/LayoutRubyText.h ('k') | Source/core/layout/LayoutText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698