Be more restrictive about forcing relayout of children for pagination.

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

 /*
  * This file is part of the layout object implementation for KHTML.
  *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003 Apple Computer, Inc.
  *
  * 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 386 matching lines @@
       relayoutChildren = true;
 
     layoutPositionedObjects(relayoutChildren || isDocumentElement());
 
     computeOverflow(oldClientAfterEdge);
   }
 
   updateLayerTransformAfterLayout();
   updateAfterLayout();
 
-  if (view()->layoutState()->pageLogicalHeight())
-    setPageLogicalOffset(
-        view()->layoutState()->pageLogicalOffset(*this, logicalTop()));
-
   clearNeedsLayout();
 }
 
 // The first walk over our kids is to find out if we have any flexible children.
 static void gatherFlexChildrenInfo(FlexBoxIterator& iterator,
                                    bool relayoutChildren,
                                    unsigned& highestFlexGroup,
                                    unsigned& lowestFlexGroup,
                                    bool& haveFlex) {
   for (LayoutBox* child = iterator.first(); child; child = iterator.next()) {
@@ skipping 17 matching lines @@
     }
   }
 }
 
 void LayoutDeprecatedFlexibleBox::layoutHorizontalBox(bool relayoutChildren) {
   LayoutUnit toAdd =
       borderBottom() + paddingBottom() + horizontalScrollbarHeight();
   LayoutUnit yPos = borderTop() + paddingTop();
   LayoutUnit xPos = borderLeft() + paddingLeft();
   bool heightSpecified = false;
+  bool paginated = view()->layoutState()->isPaginated();
   LayoutUnit oldHeight;
 
   LayoutUnit remainingSpace;
 
   FlexBoxIterator iterator(this);
   unsigned highestFlexGroup = 0;
   unsigned lowestFlexGroup = 0;
   bool haveFlex = false, flexingChildren = false;
   gatherFlexChildrenInfo(iterator, relayoutChildren, highestFlexGroup,
                          lowestFlexGroup, haveFlex);
@@ skipping 49 matching lines @@
 
         // Update our maximum descent.
         maxDescent = std::max(maxDescent, descent);
 
         // Now update our height.
         setHeight(std::max(yPos + maxAscent + maxDescent, size().height()));
       } else {
         setHeight(std::max(size().height(), yPos + child->size().height() +
                                                 child->marginHeight()));
       }
+
+      if (paginated)
+        updateFragmentationInfoForChild(*child);
     }
 
     if (!iterator.first() && hasLineIfEmpty())
       setHeight(size().height() + lineHeight(true,
                                              style()->isHorizontalWritingMode()
                                                  ? HorizontalLine
                                                  : VerticalLine,
                                              PositionOfInteriorLineBoxes));
 
     setHeight(size().height() + toAdd);
@@ skipping 250 matching lines @@
   // to the intrinsic height before returning.
   if (heightSpecified)
     setHeight(oldHeight);
 }
 
 void LayoutDeprecatedFlexibleBox::layoutVerticalBox(bool relayoutChildren) {
   LayoutUnit yPos = borderTop() + paddingTop();
   LayoutUnit toAdd =
       borderBottom() + paddingBottom() + horizontalScrollbarHeight();
   bool heightSpecified = false;
+  bool paginated = view()->layoutState()->isPaginated();
   LayoutUnit oldHeight;
 
   LayoutUnit remainingSpace;
 
   FlexBoxIterator iterator(this);
   unsigned highestFlexGroup = 0;
   unsigned lowestFlexGroup = 0;
   bool haveFlex = false, flexingChildren = false;
   gatherFlexChildrenInfo(iterator, relayoutChildren, highestFlexGroup,
                          lowestFlexGroup, haveFlex);
@@ skipping 78 matching lines @@
           else
             childX +=
                 contentWidth() - child->marginRight() - child->size().width();
           break;
       }
 
       // Place the child.
       placeChild(child, LayoutPoint(childX, size().height()));
       setHeight(size().height() + child->size().height() +
                 child->marginBottom());
+
+      if (paginated)
+        updateFragmentationInfoForChild(*child);
     }
 
     yPos = size().height();
 
     if (!iterator.first() && hasLineIfEmpty())
       setHeight(size().height() + lineHeight(true,
                                              style()->isHorizontalWritingMode()
                                                  ? HorizontalLine
                                                  : VerticalLine,
                                              PositionOfInteriorLineBoxes));
@@ skipping 366 matching lines @@
   if (minHeight.isFixed() || minHeight.isAuto()) {
     LayoutUnit minHeight(child->style()->minHeight().value());
     LayoutUnit height = contentHeightForChild(child);
     LayoutUnit allowedShrinkage = (minHeight - height).clampPositiveToZero();
     return allowedShrinkage;
   }
   return LayoutUnit();
 }
 
 }  // namespace blink