| Index: Source/core/layout/line/InlineFlowBox.h
|
| diff --git a/Source/core/layout/line/InlineFlowBox.h b/Source/core/layout/line/InlineFlowBox.h
|
| index 9b8842439d53a48908aea2119a0f395c78504464..52c888590325098f4beaef8c64584746ead09290 100644
|
| --- a/Source/core/layout/line/InlineFlowBox.h
|
| +++ b/Source/core/layout/line/InlineFlowBox.h
|
| @@ -215,9 +215,7 @@ public:
|
| // respectively are flipped when compared to their physical counterparts. For example minX is on the left in vertical-lr, but it is on the right in vertical-rl.
|
| LayoutRect layoutOverflowRect(LayoutUnit lineTop, LayoutUnit lineBottom) const
|
| {
|
| - // FIXME: the call to enclosingLayoutRect() below is temporary and should be removed once
|
| - // the transition to LayoutUnit-based types is complete (crbug.com/321237)
|
| - return m_overflow ? m_overflow->layoutOverflowRect() : enclosingLayoutRect(frameRectIncludingLineHeight(lineTop, lineBottom));
|
| + return m_overflow ? m_overflow->layoutOverflowRect() : frameRectIncludingLineHeight(lineTop, lineBottom);
|
| }
|
| LayoutUnit logicalTopLayoutOverflow(LayoutUnit lineTop) const
|
| {
|
| @@ -241,9 +239,7 @@ public:
|
|
|
| LayoutRect visualOverflowRect(LayoutUnit lineTop, LayoutUnit lineBottom) const
|
| {
|
| - // FIXME: the call to enclosingLayoutRect() below is temporary and should be removed once
|
| - // the transition to LayoutUnit-based types is complete (crbug.com/321237)
|
| - return m_overflow ? m_overflow->visualOverflowRect() : enclosingLayoutRect(frameRectIncludingLineHeight(lineTop, lineBottom));
|
| + return m_overflow ? m_overflow->visualOverflowRect() : frameRectIncludingLineHeight(lineTop, lineBottom);
|
| }
|
| LayoutUnit logicalLeftVisualOverflow() const { return m_overflow ? (isHorizontal() ? m_overflow->visualOverflowRect().x() : m_overflow->visualOverflowRect().y()) : logicalLeft(); }
|
| LayoutUnit logicalRightVisualOverflow() const { return m_overflow ? (isHorizontal() ? m_overflow->visualOverflowRect().maxX() : m_overflow->visualOverflowRect().maxY()) : static_cast<LayoutUnit>(logicalRight().ceil()); }
|
|
|