Remove pageLogicalHeightChanged() from LayoutState.

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 466 matching lines @@
   rebuildFloatsFromIntruding();
 
   bool pageLogicalHeightChanged = false;
   bool hasSpecifiedPageLogicalHeight = false;
   checkForPaginationLogicalHeightChange(pageLogicalHeight,
                                         pageLogicalHeightChanged,
                                         hasSpecifiedPageLogicalHeight);
   if (pageLogicalHeightChanged)
     relayoutChildren = true;
 
-  LayoutState state(*this, pageLogicalHeight, pageLogicalHeightChanged,
-                    logicalWidthChanged);
+  LayoutState state(*this, pageLogicalHeight, logicalWidthChanged);
 
   if (m_paginationStateChanged) {
     // We now need a deep layout to clean up struts after pagination, if we
     // just ceased to be paginated, or, if we just became paginated on the
     // other hand, we now need the deep layout, to insert pagination struts.
     m_paginationStateChanged = false;
     state.setPaginationStateChanged();
   }
 
   // We use four values, maxTopPos, maxTopNeg, maxBottomPos, and maxBottomNeg,
@@ skipping 3027 matching lines @@
     FloatingObjectSetIterator it =
         floatingObjectSet.find<FloatingObjectHashTranslator>(&floatBox);
     if (it != floatingObjectSet.end())
       return it->get();
   }
 
   // Create the special object entry & append it to the list
 
   std::unique_ptr<FloatingObject> newObj = FloatingObject::create(&floatBox);
 
-  // Our location is irrelevant if we're unsplittable or no pagination is in
-  // effect. Just go ahead and lay out the float.
-  bool isChildLayoutBlock = floatBox.isLayoutBlock();
-  if (isChildLayoutBlock && !floatBox.needsLayout() &&
-      view()->layoutState()->pageLogicalHeightChanged())
-    floatBox.setChildNeedsLayout(MarkOnlyThis);
-
+  // TODO(mstensho): Avoid laying out before positioning the object, as that's
+  // bad for pagination.
   floatBox.layoutIfNeeded();
 
   setLogicalWidthForFloat(*newObj, logicalWidthForChild(floatBox) +
                                        marginStartForChild(floatBox) +
                                        marginEndForChild(floatBox));
 
   return m_floatingObjects->add(std::move(newObj));
 }
 
 void LayoutBlockFlow::removeFloatingObject(LayoutBox* floatBox) {
@@ skipping 997 matching lines @@
   return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
 }
 
 void LayoutBlockFlow::invalidateDisplayItemClients(
     PaintInvalidationReason invalidationReason) const {
   BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(
       invalidationReason);
 }
 
 }  // namespace blink