Switch line layout to LayoutUnit.

Source/core/layout/LayoutTextCombine.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 34 matching lines @@
     updateIsCombined();
 }
 
 void LayoutTextCombine::setTextInternal(PassRefPtr<StringImpl> text)
 {
     LayoutText::setTextInternal(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;
 
     if (hasEmptyText())
         return 0;
 
     if (m_isCombined)
         return font.fontDescription().computedSize();
 
     return LayoutText::width(from, length, font, xPosition, direction, fallbackFonts, glyphOverflow);
 }
 
 void scaleHorizontallyAndTranslate(GraphicsContext& context, float scaleX, float centerX, float offsetX, float offsetY)
 {
     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);
     if (m_scaleX >= 1.0f) {
         // Fast path, more than 90% of cases
         ASSERT(m_scaleX == 1.0f);
         context.concatCTM(AffineTransform::translation(offsetXNoScale(boxRect), 0));
         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);
     boxRect.move(offsetXNoScale(boxRect), 0);
 }
 
 void LayoutTextCombine::updateIsCombined()
 {
     // CSS3 spec says text-combine works only in vertical writing mode.
     m_isCombined = !style()->isHorizontalWritingMode()
@@ skipping 54 matching lines @@
         } else {
             m_scaleX = 1.0f;
         }
     }
 
     if (shouldUpdateFont)
         style()->font().update(fontSelector);
 }
 
 } // namespace blink