Index: Source/core/rendering/RootInlineBox.cpp |
diff --git a/Source/core/rendering/RootInlineBox.cpp b/Source/core/rendering/RootInlineBox.cpp |
index 2cd1c556ad9e490a9daaddd4006c01571532a62c..e6f5fa0ae8804a2af81de95618609c466b3d627b 100644 |
--- a/Source/core/rendering/RootInlineBox.cpp |
+++ b/Source/core/rendering/RootInlineBox.cpp |
@@ -113,12 +113,12 @@ 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. |
EllipsisBox* ellipsisBox = new EllipsisBox(renderer(), ellipsisStr, this, |
- ellipsisWidth - (markupBox ? markupBox->logicalWidth() : 0), logicalHeight(), |
+ ellipsisWidth - (markupBox ? markupBox->logicalWidth() : ZERO_LAYOUT_UNIT), logicalHeight(), |
x(), y(), !prevRootBox(), isHorizontal(), markupBox); |
if (!gEllipsisBoxMap) |
@@ -136,15 +136,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 = ZERO_LAYOUT_UNIT; |
+ 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; |
@@ -168,7 +168,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. |
@@ -247,9 +247,9 @@ LayoutUnit RootInlineBox::alignBoxesInBlockDirection(LayoutUnit heightOfBlock, G |
return heightOfBlock + maxHeight; |
} |
-float RootInlineBox::maxLogicalTop() const |
+FloatWillBeLayoutUnit RootInlineBox::maxLogicalTop() const |
{ |
- float maxLogicalTop = 0; |
+ FloatWillBeLayoutUnit maxLogicalTop = ZERO_LAYOUT_UNIT; |
computeMaxLogicalTop(maxLogicalTop); |
return maxLogicalTop; |
} |