| Index: Source/core/layout/line/RootInlineBox.h
|
| diff --git a/Source/core/layout/line/RootInlineBox.h b/Source/core/layout/line/RootInlineBox.h
|
| index 6e10125df17b615fbf1df4d77bc210befcb83c19..18ff6b7c6323520ca5e7ad9fe8e4a41db6255df9 100644
|
| --- a/Source/core/layout/line/RootInlineBox.h
|
| +++ b/Source/core/layout/line/RootInlineBox.h
|
| @@ -21,7 +21,6 @@
|
| #ifndef RootInlineBox_h
|
| #define RootInlineBox_h
|
|
|
| -#include "core/layout/line/FloatToLayoutUnit.h"
|
| #include "core/layout/line/InlineFlowBox.h"
|
| #include "platform/text/BidiContext.h"
|
|
|
| @@ -47,7 +46,7 @@ public:
|
| RootInlineBox* nextRootBox() const { return static_cast<RootInlineBox*>(m_nextLineBox); }
|
| RootInlineBox* prevRootBox() const { return static_cast<RootInlineBox*>(m_prevLineBox); }
|
|
|
| - virtual void adjustPosition(FloatWillBeLayoutUnit dx, FloatWillBeLayoutUnit dy) override final;
|
| + virtual void adjustPosition(LayoutUnit dx, LayoutUnit dy) override final;
|
|
|
| LayoutUnit lineTop() const { return m_lineTop; }
|
| LayoutUnit lineBottom() const { return m_lineBottom; }
|
| @@ -93,9 +92,9 @@ public:
|
|
|
| bool lineCanAccommodateEllipsis(bool ltr, int blockEdge, int lineBoxEdge, int ellipsisWidth);
|
| // Return the truncatedWidth, the width of the truncated text + ellipsis.
|
| - FloatWillBeLayoutUnit placeEllipsis(const AtomicString& ellipsisStr, bool ltr, FloatWillBeLayoutUnit blockLeftEdge, FloatWillBeLayoutUnit blockRightEdge, FloatWillBeLayoutUnit ellipsisWidth);
|
| + LayoutUnit placeEllipsis(const AtomicString& ellipsisStr, bool ltr, LayoutUnit blockLeftEdge, LayoutUnit blockRightEdge, LayoutUnit ellipsisWidth);
|
| // Return the position of the EllipsisBox or -1.
|
| - virtual FloatWillBeLayoutUnit placeEllipsisBox(bool ltr, FloatWillBeLayoutUnit blockLeftEdge, FloatWillBeLayoutUnit blockRightEdge, FloatWillBeLayoutUnit ellipsisWidth, FloatWillBeLayoutUnit &truncatedWidth, bool& foundBox) override final;
|
| + virtual LayoutUnit placeEllipsisBox(bool ltr, LayoutUnit blockLeftEdge, LayoutUnit blockRightEdge, LayoutUnit ellipsisWidth, LayoutUnit &truncatedWidth, bool& foundBox) override final;
|
|
|
| using InlineBox::hasEllipsisBox;
|
| EllipsisBox* ellipsisBox() const;
|
| @@ -171,7 +170,7 @@ public:
|
| }
|
|
|
| // Used to calculate the underline offset for TextUnderlinePositionUnder.
|
| - FloatWillBeLayoutUnit maxLogicalTop() const;
|
| + LayoutUnit maxLogicalTop() const;
|
|
|
| Node* getLogicalStartBoxWithNode(InlineBox*&) const;
|
| Node* getLogicalEndBoxWithNode(InlineBox*&) const;
|
|
|