Switch line layout to LayoutUnit.

Source/core/layout/line/InlineTextBox.h

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2009, 2010, 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef InlineTextBox_h
 #define InlineTextBox_h
 
 #include "core/layout/LayoutText.h" // so textLayoutObject() can be inline
-#include "core/layout/line/FloatToLayoutUnit.h"
 #include "core/layout/line/InlineBox.h"
 #include "platform/text/TextRun.h"
 #include "wtf/Forward.h"
 
 namespace blink {
 
 class DocumentMarker;
 class GraphicsContext;
 
 const unsigned short cNoTruncation = USHRT_MAX;
@@ skipping 56 matching lines @@
 #ifndef NDEBUG
     virtual void showBox(int = 0) const override;
 #endif
     virtual const char* boxName() const override;
     virtual String debugName() const override;
 
     String text() const;
 
 public:
     TextRun constructTextRunForInspector(const ComputedStyle&, const Font&) const;
-    virtual FloatRectWillBeLayoutRect calculateBoundaries() const override { return FloatRectWillBeLayoutRect(x(), y(), width(), height()); }
+    virtual LayoutRect calculateBoundaries() const override { return LayoutRect(x(), y(), width(), height()); }
 
     virtual LayoutRect localSelectionRect(int startPos, int endPos);
     bool isSelected(int startPos, int endPos) const;
     void selectionStartEnd(int& sPos, int& ePos) const;
 
     // These functions both paint markers and update the DocumentMarker's renderedRect.
-    virtual void paintDocumentMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&, bool grammar);
-    virtual void paintTextMatchMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&);
+    virtual void paintDocumentMarker(GraphicsContext*, const LayoutPoint& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&, bool grammar);
+    virtual void paintTextMatchMarker(GraphicsContext*, const LayoutPoint& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&);
 
 protected:
     virtual void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
     virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override;
 
 private:
     virtual void deleteLine() override final;
     virtual void extractLine() override final;
     virtual void attachLine() override final;
 
 public:
     virtual LayoutObject::SelectionState selectionState() const override final;
 
 private:
     virtual void clearTruncation() override final { m_truncation = cNoTruncation; }
-    virtual FloatWillBeLayoutUnit placeEllipsisBox(bool flowIsLTR, FloatWillBeLayoutUnit visibleLeftEdge, FloatWillBeLayoutUnit visibleRightEdge, FloatWillBeLayoutUnit ellipsisWidth, FloatWillBeLayoutUnit &truncatedWidth, bool& foundBox) override final;
+    virtual LayoutUnit placeEllipsisBox(bool flowIsLTR, LayoutUnit visibleLeftEdge, LayoutUnit visibleRightEdge, LayoutUnit ellipsisWidth, LayoutUnit &truncatedWidth, bool& foundBox) override final;
 
 public:
     virtual bool isLineBreak() const override final;
 
     void setExpansion(int newExpansion)
     {
         m_logicalWidth -= expansion();
         InlineBox::setExpansion(newExpansion);
         m_logicalWidth += newExpansion;
     }
 
 private:
     virtual bool isInlineTextBox() const override final { return true; }
 
 public:
     virtual int caretMinOffset() const override final;
     virtual int caretMaxOffset() const override final;
 
-    FloatWillBeLayoutUnit textPos() const; // returns the x position relative to the left start of the text line.
+    LayoutUnit textPos() const; // returns the x position relative to the left start of the text line.
 
 public:
-    virtual int offsetForPosition(FloatWillBeLayoutUnit x, bool includePartialGlyphs = true) const;
-    virtual FloatWillBeLayoutUnit positionForOffset(int offset) const;
+    virtual int offsetForPosition(LayoutUnit x, bool includePartialGlyphs = true) const;
+    virtual LayoutUnit positionForOffset(int offset) const;
 
     bool containsCaretOffset(int offset) const; // false for offset after line break
 
     // Fills a vector with the pixel width of each character.
-    void characterWidths(Vector<FloatWillBeLayoutUnit>&) const;
+    void characterWidths(Vector<float>&) const;
 
 private:
     InlineTextBox* m_prevTextBox; // The previous box that also uses our LayoutObject
     InlineTextBox* m_nextTextBox; // The next box that also uses our LayoutObject
 
     int m_start;
     unsigned short m_len;
 
     // Where to truncate when text overflow is applied.  We use special constants to denote
     // no truncation (the whole run paints) and full truncation (nothing paints at all).
     unsigned short m_truncation;
 
 private:
     TextRun::ExpansionBehavior expansionBehavior() const
     {
         return (canHaveLeadingExpansion() ? TextRun::AllowLeadingExpansion : TextRun::ForbidLeadingExpansion)
             | (expansion() && nextLeafChild() ? TextRun::AllowTrailingExpansion : TextRun::ForbidTrailingExpansion);
     }
 };
 
 DEFINE_INLINE_BOX_TYPE_CASTS(InlineTextBox);
 
-void alignSelectionRectToDevicePixels(FloatRectWillBeLayoutRect&);
+void alignSelectionRectToDevicePixels(LayoutRect&);
 
 } // namespace blink
 
 #endif // InlineTextBox_h