| Index: third_party/WebKit/Source/core/layout/line/InlineBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/line/InlineBox.cpp b/third_party/WebKit/Source/core/layout/line/InlineBox.cpp
|
| index 7acdb22dc3cdc41c3b1964250ba65fae6421248c..822592a038391fd00584e8d1f9089a2a649627dc 100644
|
| --- a/third_party/WebKit/Source/core/layout/line/InlineBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/line/InlineBox.cpp
|
| @@ -305,17 +305,17 @@ SelectionState InlineBox::getSelectionState() const {
|
| }
|
|
|
| bool InlineBox::canAccommodateEllipsis(bool ltr,
|
| - int blockEdge,
|
| - int ellipsisWidth) const {
|
| + LayoutUnit blockEdge,
|
| + LayoutUnit ellipsisWidth) const {
|
| // Non-atomic inline-level elements can always accommodate an ellipsis.
|
| // Skip list markers and try the next box.
|
| if (!getLineLayoutItem().isAtomicInlineLevel() ||
|
| getLineLayoutItem().isListMarker())
|
| return true;
|
|
|
| - IntRect boxRect(x().toInt(), 0, m_logicalWidth.toInt(), 10);
|
| - IntRect ellipsisRect(ltr ? blockEdge - ellipsisWidth : blockEdge, 0,
|
| - ellipsisWidth, 10);
|
| + LayoutRect boxRect(x(), LayoutUnit(), m_logicalWidth, LayoutUnit(10));
|
| + LayoutRect ellipsisRect(ltr ? blockEdge - ellipsisWidth : blockEdge,
|
| + LayoutUnit(), ellipsisWidth, LayoutUnit(10));
|
| return !(boxRect.intersects(ellipsisRect));
|
| }
|
|
|
|
|