| Index: third_party/WebKit/Source/core/layout/line/LineLayoutState.h
|
| diff --git a/third_party/WebKit/Source/core/layout/line/LineLayoutState.h b/third_party/WebKit/Source/core/layout/line/LineLayoutState.h
|
| index ff9ab4b7b4d11dd579074ed8acc215d59b4bdc93..ce68b8eb323b43ca14e17d15df88c4768dd63a2a 100644
|
| --- a/third_party/WebKit/Source/core/layout/line/LineLayoutState.h
|
| +++ b/third_party/WebKit/Source/core/layout/line/LineLayoutState.h
|
| @@ -45,7 +45,6 @@ public:
|
| , m_isFullLayout(fullLayout)
|
| , m_paintInvalidationLogicalTop(paintInvalidationLogicalTop)
|
| , m_paintInvalidationLogicalBottom(paintInvalidationLogicalBottom)
|
| - , m_adjustedLogicalLineTop(0)
|
| , m_usesPaintInvalidationBounds(false)
|
| , m_flowThread(flowThread)
|
| { }
|
| @@ -61,11 +60,11 @@ public:
|
| m_paintInvalidationLogicalTop = m_paintInvalidationLogicalBottom = logicalHeight;
|
| }
|
|
|
| - void updatePaintInvalidationRangeFromBox(RootInlineBox* box, LayoutUnit paginationDelta = 0)
|
| + void updatePaintInvalidationRangeFromBox(RootInlineBox* box, LayoutUnit paginationDelta = LayoutUnit())
|
| {
|
| m_usesPaintInvalidationBounds = true;
|
| - m_paintInvalidationLogicalTop = std::min(m_paintInvalidationLogicalTop, box->logicalTopVisualOverflow() + std::min<LayoutUnit>(paginationDelta, 0));
|
| - m_paintInvalidationLogicalBottom = std::max(m_paintInvalidationLogicalBottom, box->logicalBottomVisualOverflow() + std::max<LayoutUnit>(paginationDelta, 0));
|
| + m_paintInvalidationLogicalTop = std::min(m_paintInvalidationLogicalTop, box->logicalTopVisualOverflow() + paginationDelta.clampPositiveToZero());
|
| + m_paintInvalidationLogicalBottom = std::max(m_paintInvalidationLogicalBottom, box->logicalBottomVisualOverflow() + paginationDelta.clampNegativeToZero());
|
| }
|
|
|
| bool endLineMatched() const { return m_endLineMatched; }
|
|
|