| Index: third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp
|
| index 2a6ac0ce733c96b8970fa8b93f16b9fc3d1f9053..00be42e62b562a3327660e22f3a59bd251774874 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp
|
| @@ -404,10 +404,6 @@ void LayoutDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren) {
|
| updateLayerTransformAfterLayout();
|
| updateAfterLayout();
|
|
|
| - if (view()->layoutState()->pageLogicalHeight())
|
| - setPageLogicalOffset(
|
| - view()->layoutState()->pageLogicalOffset(*this, logicalTop()));
|
| -
|
| clearNeedsLayout();
|
| }
|
|
|
| @@ -445,6 +441,7 @@ void LayoutDeprecatedFlexibleBox::layoutHorizontalBox(bool relayoutChildren) {
|
| LayoutUnit yPos = borderTop() + paddingTop();
|
| LayoutUnit xPos = borderLeft() + paddingLeft();
|
| bool heightSpecified = false;
|
| + bool paginated = view()->layoutState()->isPaginated();
|
| LayoutUnit oldHeight;
|
|
|
| LayoutUnit remainingSpace;
|
| @@ -514,6 +511,9 @@ void LayoutDeprecatedFlexibleBox::layoutHorizontalBox(bool relayoutChildren) {
|
| setHeight(std::max(size().height(), yPos + child->size().height() +
|
| child->marginHeight()));
|
| }
|
| +
|
| + if (paginated)
|
| + updateFragmentationInfoForChild(*child);
|
| }
|
|
|
| if (!iterator.first() && hasLineIfEmpty())
|
| @@ -784,6 +784,7 @@ void LayoutDeprecatedFlexibleBox::layoutVerticalBox(bool relayoutChildren) {
|
| LayoutUnit toAdd =
|
| borderBottom() + paddingBottom() + horizontalScrollbarHeight();
|
| bool heightSpecified = false;
|
| + bool paginated = view()->layoutState()->isPaginated();
|
| LayoutUnit oldHeight;
|
|
|
| LayoutUnit remainingSpace;
|
| @@ -882,6 +883,9 @@ void LayoutDeprecatedFlexibleBox::layoutVerticalBox(bool relayoutChildren) {
|
| placeChild(child, LayoutPoint(childX, size().height()));
|
| setHeight(size().height() + child->size().height() +
|
| child->marginBottom());
|
| +
|
| + if (paginated)
|
| + updateFragmentationInfoForChild(*child);
|
| }
|
|
|
| yPos = size().height();
|
|
|