| 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 1c27fd31adae317a934f1bb0d3127e0b83f7dde8..e4ba33cf41cf5f89a1aaa1d71aac75a365c0010e 100644
|
| --- a/third_party/WebKit/Source/core/layout/line/LineLayoutState.h
|
| +++ b/third_party/WebKit/Source/core/layout/line/LineLayoutState.h
|
| @@ -35,36 +35,18 @@ namespace blink {
|
| class LineLayoutState {
|
| STACK_ALLOCATED();
|
| public:
|
| - LineLayoutState(bool fullLayout, LayoutUnit& paintInvalidationLogicalTop, LayoutUnit& paintInvalidationLogicalBottom)
|
| + LineLayoutState(bool fullLayout)
|
| : m_lastFloat(nullptr)
|
| , m_endLine(nullptr)
|
| , m_floatIndex(0)
|
| , m_endLineMatched(false)
|
| , m_hasInlineChild(false)
|
| , m_isFullLayout(fullLayout)
|
| - , m_paintInvalidationLogicalTop(paintInvalidationLogicalTop)
|
| - , m_paintInvalidationLogicalBottom(paintInvalidationLogicalBottom)
|
| - , m_usesPaintInvalidationBounds(false)
|
| { }
|
|
|
| void markForFullLayout() { m_isFullLayout = true; }
|
| bool isFullLayout() const { return m_isFullLayout; }
|
|
|
| - bool usesPaintInvalidationBounds() const { return m_usesPaintInvalidationBounds; }
|
| -
|
| - void setPaintInvalidationRange(LayoutUnit logicalHeight)
|
| - {
|
| - m_usesPaintInvalidationBounds = true;
|
| - m_paintInvalidationLogicalTop = m_paintInvalidationLogicalBottom = logicalHeight;
|
| - }
|
| -
|
| - void updatePaintInvalidationRangeFromBox(RootInlineBox* box, LayoutUnit paginationDelta = LayoutUnit())
|
| - {
|
| - m_usesPaintInvalidationBounds = true;
|
| - 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; }
|
| void setEndLineMatched(bool endLineMatched) { m_endLineMatched = endLineMatched; }
|
|
|
| @@ -106,13 +88,7 @@ private:
|
|
|
| bool m_isFullLayout;
|
|
|
| - // FIXME: Should this be a range object instead of two ints?
|
| - LayoutUnit& m_paintInvalidationLogicalTop;
|
| - LayoutUnit& m_paintInvalidationLogicalBottom;
|
| -
|
| LayoutUnit m_adjustedLogicalLineTop;
|
| -
|
| - bool m_usesPaintInvalidationBounds;
|
| };
|
|
|
| } // namespace blink
|
|
|