Introduce markChildForPaginationRelayoutIfNeeded().

third_party/WebKit/Source/core/layout/LayoutBlock.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 708 matching lines @@
             // we are, estimate its logical top now. We need to know this up-front, to correctly
             // evaluate if we need to mark for relayout, and, if our estimate is correct, we'll
             // even be able to insert correct pagination struts on the first attempt.
             LogicalExtentComputedValues computedValues;
             positionedObject->computeLogicalHeight(positionedObject->logicalHeight(), positionedObject->logicalTop(), computedValues);
             logicalTopEstimate = computedValues.m_position;
             positionedObject->setLogicalTop(logicalTopEstimate);
         }
 
         if (!positionedObject->needsLayout())
-            positionedObject->markForPaginationRelayoutIfNeeded(layoutScope);
+            markChildForPaginationRelayoutIfNeeded(*positionedObject, layoutScope);
 
         // FIXME: We should be able to do a r->setNeedsPositionedMovementLayout() here instead of a full layout. Need
         // to investigate why it does not trigger the correct invalidations in that case. crbug.com/350756
         if (info == ForcedLayoutAfterContainingBlockMoved)
             positionedObject->setNeedsLayout(LayoutInvalidationReason::AncestorMoved, MarkOnlyThis);
 
         positionedObject->layoutIfNeeded();
 
         LayoutObject* parent = positionedObject->parent();
         bool layoutChanged = false;
@@ skipping 12 matching lines @@
 }
 
 void LayoutBlock::markPositionedObjectsForLayout()
 {
     if (TrackedLayoutBoxListHashSet* positionedDescendants = positionedObjects()) {
         for (auto* descendant : *positionedDescendants)
             descendant->setChildNeedsLayout();
     }
 }
 
-void LayoutBlock::markForPaginationRelayoutIfNeeded(SubtreeLayoutScope& layoutScope)
-{
-    ASSERT(!needsLayout());
-    if (needsLayout())
-        return;
-
-    if (view()->layoutState()->pageLogicalHeightChanged() || (view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageLogicalOffset(*this, logicalTop()) != pageLogicalOffset()))
-        layoutScope.setChildNeedsLayout(this);
-}
-
 void LayoutBlock::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
 {
     BlockPainter(*this).paint(paintInfo, paintOffset);
 }
 
 void LayoutBlock::paintChildren(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
 {
     BlockPainter(*this).paintChildren(paintInfo, paintOffset);
 }
 
@@ skipping 1166 matching lines @@
 
     return availableHeight;
 }
 
 bool LayoutBlock::hasDefiniteLogicalHeight() const
 {
     return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1);
 }
 
 } // namespace blink