Chromium Code Reviews| Index: Source/core/rendering/RootInlineBox.cpp |
| diff --git a/Source/core/rendering/RootInlineBox.cpp b/Source/core/rendering/RootInlineBox.cpp |
| index b361819f21e6f4c541c8a93fea41aed5423be006..b2ce903d0102a0308b6cf2344c9976b726be3f41 100644 |
| --- a/Source/core/rendering/RootInlineBox.cpp |
| +++ b/Source/core/rendering/RootInlineBox.cpp |
| @@ -114,7 +114,7 @@ bool RootInlineBox::lineCanAccommodateEllipsis(bool ltr, int blockEdge, int line |
| return InlineFlowBox::canAccommodateEllipsis(ltr, blockEdge, ellipsisWidth); |
| } |
| -float RootInlineBox::placeEllipsis(const AtomicString& ellipsisStr, bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, |
| +FloatWillBeLayoutUnit RootInlineBox::placeEllipsis(const AtomicString& ellipsisStr, bool ltr, FloatWillBeLayoutUnit blockLeftEdge, FloatWillBeLayoutUnit blockRightEdge, FloatWillBeLayoutUnit ellipsisWidth, |
| InlineBox* markupBox) |
| { |
| // Create an ellipsis box. |
| @@ -137,15 +137,15 @@ float RootInlineBox::placeEllipsis(const AtomicString& ellipsisStr, bool ltr, f |
| // of that glyph. Mark all of the objects that intersect the ellipsis box as not painting (as being |
| // truncated). |
| bool foundBox = false; |
| - float truncatedWidth = 0; |
| - float position = placeEllipsisBox(ltr, blockLeftEdge, blockRightEdge, ellipsisWidth, truncatedWidth, foundBox); |
| + FloatWillBeLayoutUnit truncatedWidth = 0; |
| + FloatWillBeLayoutUnit position = placeEllipsisBox(ltr, blockLeftEdge, blockRightEdge, ellipsisWidth, truncatedWidth, foundBox); |
| ellipsisBox->setLogicalLeft(position); |
| return truncatedWidth; |
| } |
| -float RootInlineBox::placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, float &truncatedWidth, bool& foundBox) |
| +FloatWillBeLayoutUnit RootInlineBox::placeEllipsisBox(bool ltr, FloatWillBeLayoutUnit blockLeftEdge, FloatWillBeLayoutUnit blockRightEdge, FloatWillBeLayoutUnit ellipsisWidth, FloatWillBeLayoutUnit &truncatedWidth, bool& foundBox) |
| { |
| - float result = InlineFlowBox::placeEllipsisBox(ltr, blockLeftEdge, blockRightEdge, ellipsisWidth, truncatedWidth, foundBox); |
| + FloatWillBeLayoutUnit result = InlineFlowBox::placeEllipsisBox(ltr, blockLeftEdge, blockRightEdge, ellipsisWidth, truncatedWidth, foundBox); |
| if (result == -1) { |
| result = ltr ? blockRightEdge - ellipsisWidth : blockLeftEdge; |
| truncatedWidth = blockRightEdge - blockLeftEdge; |
| @@ -169,7 +169,7 @@ bool RootInlineBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& re |
| return InlineFlowBox::nodeAtPoint(request, result, locationInContainer, accumulatedOffset, lineTop, lineBottom); |
| } |
| -void RootInlineBox::adjustPosition(float dx, float dy) |
| +void RootInlineBox::adjustPosition(FloatWillBeLayoutUnit dx, FloatWillBeLayoutUnit dy) |
| { |
| InlineFlowBox::adjustPosition(dx, dy); |
| LayoutUnit blockDirectionDelta = isHorizontal() ? dy : dx; // The block direction delta is a LayoutUnit. |
| @@ -246,9 +246,9 @@ LayoutUnit RootInlineBox::alignBoxesInBlockDirection(LayoutUnit heightOfBlock, G |
| return heightOfBlock + maxHeight; |
| } |
| -float RootInlineBox::maxLogicalTop() const |
| +FloatWillBeLayoutUnit RootInlineBox::maxLogicalTop() const |
| { |
| - float maxLogicalTop = 0; |
| + FloatWillBeLayoutUnit maxLogicalTop = 0; |
|
leviw_travelin_and_unemployed
2014/11/13 19:51:23
Ditto.
|
| computeMaxLogicalTop(maxLogicalTop); |
| return maxLogicalTop; |
| } |