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