Switch line layout to LayoutUnit.

Source/core/layout/LayoutTextCombine.cpp

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;

[eae, 2015/05/26 18:56:32]

float centerX = (boxRect.x() + boxRect.width()).toFloat() / 2;
reduces the number of type conversions by at least two.

[szager1, 2015/05/27 05:59:42]

Done.

[szager1, 2015/05/27 21:24:36]

Oh, you bastard.  Your version is wrong.  That was my regression.

     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);