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

Unified Diff: Source/core/layout/LayoutTextCombine.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/LayoutTextCombine.h ('k') | Source/core/layout/LayoutTreeAsText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTextCombine.cpp
diff --git a/Source/core/layout/LayoutTextCombine.cpp b/Source/core/layout/LayoutTextCombine.cpp
index 12ddcf72c79b382b2de3a37544c02b20148e5f09..d1b983df1ad2c7ae48829a3c0f3ac220e4f2f5a4 100644
--- a/Source/core/layout/LayoutTextCombine.cpp
+++ b/Source/core/layout/LayoutTextCombine.cpp
@@ -52,7 +52,7 @@ void LayoutTextCombine::setTextInternal(PassRefPtr<StringImpl> text)
updateIsCombined();
}
-float LayoutTextCombine::width(unsigned from, unsigned length, const Font& font, float xPosition, TextDirection direction, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
+float LayoutTextCombine::width(unsigned from, unsigned length, const Font& font, LayoutUnit xPosition, TextDirection direction, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
{
if (!length)
return 0;
@@ -71,7 +71,7 @@ void scaleHorizontallyAndTranslate(GraphicsContext& context, float scaleX, float
context.concatCTM(AffineTransform(scaleX, 0, 0, 1, centerX * (1.0f - scaleX) + offsetX * scaleX, offsetY));
}
-void LayoutTextCombine::transformToInlineCoordinates(GraphicsContext& context, const FloatRect& boxRect) const
+void LayoutTextCombine::transformToInlineCoordinates(GraphicsContext& context, const LayoutRect& boxRect) const
{
ASSERT(!m_needsFontUpdate);
ASSERT(m_isCombined);
@@ -82,11 +82,11 @@ void LayoutTextCombine::transformToInlineCoordinates(GraphicsContext& context, c
return;
}
ASSERT(m_scaleX > 0.0f);
- const float centerX = boxRect.x() + boxRect.width() / 2;
+ float centerX = boxRect.x() + boxRect.width().toFloat() / 2;
scaleHorizontallyAndTranslate(context, m_scaleX, centerX, offsetX(boxRect), 0);
}
-void LayoutTextCombine::transformLayoutRect(FloatRect& boxRect) const
+void LayoutTextCombine::transformLayoutRect(LayoutRect& boxRect) const
{
ASSERT(!m_needsFontUpdate);
ASSERT(m_isCombined);
« no previous file with comments | « Source/core/layout/LayoutTextCombine.h ('k') | Source/core/layout/LayoutTreeAsText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698