Switch line layout to LayoutUnit.

Source/core/layout/svg/line/SVGInlineTextBox.cpp

 /**
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010. 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.
  *
@@ skipping 21 matching lines @@
 #include "core/layout/PointerEventsHitRules.h"
 #include "core/layout/line/InlineFlowBox.h"
 #include "core/layout/svg/LayoutSVGInlineText.h"
 #include "core/paint/SVGInlineTextBoxPainter.h"
 #include "platform/FloatConversion.h"
 #include "platform/fonts/FontCache.h"
 
 namespace blink {
 
 struct ExpectedSVGInlineTextBoxSize : public InlineTextBox {
-    FloatWillBeLayoutUnit float1;
+    LayoutUnit float1;
     uint32_t bitfields : 1;
     Vector<SVGTextFragment> vector;
 };
 
 static_assert(sizeof(SVGInlineTextBox) == sizeof(ExpectedSVGInlineTextBoxSize), "SVGInlineTextBox has an unexpected size");
 
 SVGInlineTextBox::SVGInlineTextBox(LayoutObject& object, int start, unsigned short length)
     : InlineTextBox(object, start, length)
     , m_logicalHeight(0)
     , m_startsNewTextChunk(false)
 {
 }
 
 void SVGInlineTextBox::dirtyLineBoxes()
 {
     InlineTextBox::dirtyLineBoxes();
 
     // Clear the now stale text fragments
     clearTextFragments();
 
     // And clear any following text fragments as the text on which they
     // depend may now no longer exist, or glyph positions may be wrong
     InlineTextBox* nextBox = nextTextBox();
     if (nextBox)
         nextBox->dirtyLineBoxes();
 }
 
-int SVGInlineTextBox::offsetForPosition(FloatWillBeLayoutUnit, bool) const
+int SVGInlineTextBox::offsetForPosition(LayoutUnit, bool) const
 {
     // SVG doesn't use the standard offset <-> position selection system, as it's not suitable for SVGs complex needs.
     // vertical text selection, inline boxes spanning multiple lines (contrary to HTML, etc.)
     ASSERT_NOT_REACHED();
     return 0;
 }
 
-int SVGInlineTextBox::offsetForPositionInFragment(const SVGTextFragment& fragment, FloatWillBeLayoutUnit position, bool includePartialGlyphs) const
+int SVGInlineTextBox::offsetForPositionInFragment(const SVGTextFragment& fragment, LayoutUnit position, bool includePartialGlyphs) const
 {
     LayoutSVGInlineText& textLayoutObject = toLayoutSVGInlineText(this->layoutObject());
 
     float scalingFactor = textLayoutObject.scalingFactor();
     ASSERT(scalingFactor);
 
     const ComputedStyle& style = textLayoutObject.styleRef();
 
     TextRun textRun = constructTextRun(style, fragment);
 
     // Eventually handle lengthAdjust="spacingAndGlyphs".
     // FIXME: Handle vertical text.
     AffineTransform fragmentTransform;
     fragment.buildFragmentTransform(fragmentTransform);
     if (!fragmentTransform.isIdentity())
         textRun.setHorizontalGlyphStretch(narrowPrecisionToFloat(fragmentTransform.xScale()));
 
     return fragment.characterOffset - start() + textLayoutObject.scaledFont().offsetForPosition(textRun, position * scalingFactor, includePartialGlyphs);
 }
 
-FloatWillBeLayoutUnit SVGInlineTextBox::positionForOffset(int) const
+LayoutUnit SVGInlineTextBox::positionForOffset(int) const
 {
     // SVG doesn't use the offset <-> position selection system.
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 FloatRect SVGInlineTextBox::selectionRectForTextFragment(const SVGTextFragment& fragment, int startPosition, int endPosition, const ComputedStyle& style)
 {
     ASSERT(startPosition < endPosition);
 
@@ skipping 97 matching lines @@
     startPosition -= fragmentOffsetInBox;
     endPosition -= fragmentOffsetInBox;
 
     // Intersect with the fragment range.
     startPosition = std::max(startPosition, 0);
     endPosition = std::min(endPosition, static_cast<int>(fragment.length));
 
     return startPosition < endPosition;
 }
 
-void SVGInlineTextBox::paintDocumentMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint&, DocumentMarker*, const ComputedStyle&, const Font&, bool)
+void SVGInlineTextBox::paintDocumentMarker(GraphicsContext*, const LayoutPoint&, DocumentMarker*, const ComputedStyle&, const Font&, bool)
 {
     // SVG does not have support for generic document markers (e.g., spellchecking, etc).
 }
 
-void SVGInlineTextBox::paintTextMatchMarker(GraphicsContext* context, const FloatPointWillBeLayoutPoint& point, DocumentMarker* marker, const ComputedStyle& style, const Font& font)
+void SVGInlineTextBox::paintTextMatchMarker(GraphicsContext* context, const LayoutPoint& point, DocumentMarker* marker, const ComputedStyle& style, const Font& font)
 {
-    SVGInlineTextBoxPainter(*this).paintTextMatchMarker(context, point.toFloatPoint(), marker, style, font);
+    SVGInlineTextBoxPainter(*this).paintTextMatchMarker(context, point, marker, style, font);
 }
 
-FloatRectWillBeLayoutRect SVGInlineTextBox::calculateBoundaries() const
+LayoutRect SVGInlineTextBox::calculateBoundaries() const
 {
-    FloatRectWillBeLayoutRect textRect;
+    LayoutRect textRect;
 
     LayoutSVGInlineText& textLayoutObject = toLayoutSVGInlineText(this->layoutObject());
 
     float scalingFactor = textLayoutObject.scalingFactor();
     ASSERT(scalingFactor);
 
-    FloatWillBeLayoutUnit baseline = textLayoutObject.scaledFont().fontMetrics().floatAscent() / scalingFactor;
+    LayoutUnit baseline = textLayoutObject.scaledFont().fontMetrics().floatAscent() / scalingFactor;
 
     AffineTransform fragmentTransform;
     unsigned textFragmentsSize = m_textFragments.size();
     for (unsigned i = 0; i < textFragmentsSize; ++i) {
         const SVGTextFragment& fragment = m_textFragments.at(i);
-        FloatRectWillBeLayoutRect fragmentRect(fragment.x, fragment.y - baseline, fragment.width, fragment.height);
+        FloatRect fragmentRect(fragment.x, fragment.y - baseline, fragment.width, fragment.height);
         fragment.buildFragmentTransform(fragmentTransform);
-        fragmentRect = fragmentTransform.mapRect(fragmentRect.toFloatRect());
+        fragmentRect = fragmentTransform.mapRect(fragmentRect);
 
-        textRect.unite(fragmentRect);
+        textRect.unite(LayoutRect(fragmentRect));
     }
 
     return textRect;
 }
 
 bool SVGInlineTextBox::nodeAtPoint(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit, LayoutUnit)
 {
     // FIXME: integrate with InlineTextBox::nodeAtPoint better.
     ASSERT(!isLineBreak());
 
     PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_TEXT_HITTESTING, result.hitTestRequest(), layoutObject().style()->pointerEvents());
     bool isVisible = layoutObject().style()->visibility() == VISIBLE;
     if (isVisible || !hitRules.requireVisible) {
         if (hitRules.canHitBoundingBox
             || (hitRules.canHitStroke && (layoutObject().style()->svgStyle().hasStroke() || !hitRules.requireStroke))
             || (hitRules.canHitFill && (layoutObject().style()->svgStyle().hasFill() || !hitRules.requireFill))) {
-            FloatPointWillBeLayoutPoint boxOrigin(x(), y());
+            LayoutPoint boxOrigin(x(), y());
             boxOrigin.moveBy(accumulatedOffset);
-            FloatRectWillBeLayoutRect rect(boxOrigin, size());
+            LayoutRect rect(boxOrigin, size());
             // FIXME: both calls to rawValue() below is temporary and should be removed once the transition
             // to LayoutUnit-based types is complete (crbug.com/321237)
-            if (locationInContainer.intersects(rect.rawValue())) {
+            if (locationInContainer.intersects(rect)) {
                 layoutObject().updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
-                if (!result.addNodeToListBasedTestResult(layoutObject().node(), locationInContainer, rect.rawValue()))
+                if (!result.addNodeToListBasedTestResult(layoutObject().node(), locationInContainer, rect))
                     return true;
             }
         }
     }
     return false;
 }
 
 } // namespace blink