Switch line layout to LayoutUnit.

Source/core/paint/TextPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/TextPainter.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutTextCombine.h"
 #include "core/layout/line/InlineTextBox.h"
 #include "core/style/ComputedStyle.h"
 #include "core/style/ShadowList.h"
 #include "platform/fonts/Font.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/text/TextRun.h"
 #include "wtf/Assertions.h"
 #include "wtf/unicode/CharacterNames.h"
 
 namespace blink {
 
-TextPainter::TextPainter(GraphicsContext* context, const Font& font, const TextRun& run, const FloatPoint& textOrigin, const FloatRect& textBounds, bool horizontal)
+TextPainter::TextPainter(GraphicsContext* context, const Font& font, const TextRun& run, const LayoutPoint& textOrigin, const LayoutRect& textBounds, bool horizontal)
     : m_graphicsContext(context)
     , m_font(font)
     , m_run(run)
     , m_textOrigin(textOrigin)
     , m_textBounds(textBounds)
     , m_horizontal(horizontal)
     , m_emphasisMarkOffset(0)
     , m_combinedText(0)
 {
 }
@@ skipping 149 matching lines @@
 void TextPainter::paintInternalRun(TextRunPaintInfo& textRunPaintInfo, int from, int to)
 {
     ASSERT(from <= textRunPaintInfo.run.length());
     ASSERT(to <= textRunPaintInfo.run.length());
 
     textRunPaintInfo.from = from;
     textRunPaintInfo.to = to;
 
     if (step == PaintEmphasisMark) {
         m_graphicsContext->drawEmphasisMarks(m_font, textRunPaintInfo, m_emphasisMark,
-            m_textOrigin + IntSize(0, m_emphasisMarkOffset));
+            FloatPoint(m_textOrigin) + IntSize(0, m_emphasisMarkOffset));
     } else {
         ASSERT(step == PaintText);
-        m_graphicsContext->drawText(m_font, textRunPaintInfo, m_textOrigin);
+        m_graphicsContext->drawText(m_font, textRunPaintInfo, FloatPoint(m_textOrigin));
     }
 }
 
 template <TextPainter::PaintInternalStep Step>
 void TextPainter::paintInternal(int startOffset, int endOffset, int truncationPoint, TextBlobPtr* cachedTextBlob)
 {
     TextRunPaintInfo textRunPaintInfo(m_run);
     textRunPaintInfo.bounds = m_textBounds;
     if (startOffset <= endOffset) {
         // FIXME: We should be able to use cachedTextBlob in more cases.
         textRunPaintInfo.cachedTextBlob = cachedTextBlob;
         paintInternalRun<Step>(textRunPaintInfo, startOffset, endOffset);
     } else {
         if (endOffset > 0)
             paintInternalRun<Step>(textRunPaintInfo, 0, endOffset);
         if (startOffset < truncationPoint)
             paintInternalRun<Step>(textRunPaintInfo, startOffset, truncationPoint);
     }
 }
 
 void TextPainter::paintEmphasisMarkForCombinedText()
 {
     ASSERT(m_combinedText);
     DEFINE_STATIC_LOCAL(TextRun, placeholderTextRun, (&ideographicFullStopCharacter, 1));
-    FloatPoint emphasisMarkTextOrigin(m_textBounds.x(), m_textBounds.y() + m_font.fontMetrics().ascent() + m_emphasisMarkOffset);
+    FloatPoint emphasisMarkTextOrigin(m_textBounds.x().toFloat(), m_textBounds.y().toFloat() + m_font.fontMetrics().ascent() + m_emphasisMarkOffset);
     TextRunPaintInfo textRunPaintInfo(placeholderTextRun);
     textRunPaintInfo.bounds = m_textBounds;
     m_graphicsContext->concatCTM(rotation(m_textBounds, Clockwise));
     m_graphicsContext->drawEmphasisMarks(m_combinedText->originalFont(), textRunPaintInfo, m_emphasisMark, emphasisMarkTextOrigin);
     m_graphicsContext->concatCTM(rotation(m_textBounds, Counterclockwise));
 }
 
 } // namespace blink