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

Unified Diff: Source/core/layout/line/AbstractInlineTextBox.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/line/AbstractInlineTextBox.h ('k') | Source/core/layout/line/EllipsisBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/AbstractInlineTextBox.cpp
diff --git a/Source/core/layout/line/AbstractInlineTextBox.cpp b/Source/core/layout/line/AbstractInlineTextBox.cpp
index 1828c4d4f6d6c8c4c1573d3fd63f71204e077026..bef82ccc2abba675f8522d68d4c84fe8027a798c 100644
--- a/Source/core/layout/line/AbstractInlineTextBox.cpp
+++ b/Source/core/layout/line/AbstractInlineTextBox.cpp
@@ -87,7 +87,7 @@ LayoutRect AbstractInlineTextBox::bounds() const
if (!m_inlineTextBox || !m_layoutText)
return LayoutRect();
- FloatRect boundaries = m_inlineTextBox->calculateBoundaries().toFloatRect();
+ FloatRect boundaries = m_inlineTextBox->calculateBoundaries();
return LayoutRect(m_layoutText->localToAbsoluteQuad(boundaries).enclosingBoundingBox());
}
@@ -109,7 +109,7 @@ AbstractInlineTextBox::Direction AbstractInlineTextBox::direction() const
return (m_inlineTextBox->direction() == RTL ? BottomToTop : TopToBottom);
}
-void AbstractInlineTextBox::characterWidths(Vector<FloatWillBeLayoutUnit>& widths) const
+void AbstractInlineTextBox::characterWidths(Vector<float>& widths) const
{
if (!m_inlineTextBox)
return;
« no previous file with comments | « Source/core/layout/line/AbstractInlineTextBox.h ('k') | Source/core/layout/line/EllipsisBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698