Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp |
index 5e2aa45b1220394594c2aa91ab356a823d27322b..7e6e0ea4d9d8bc03a1e7226a5da400d98d7016cf 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp |
@@ -455,11 +455,6 @@ void LayoutBlockFlow::layoutBlock(bool relayoutChildren) { |
while (!done) |
done = layoutBlockFlow(relayoutChildren, pageLogicalHeight, layoutScope); |
- LayoutView* layoutView = view(); |
- if (layoutView->layoutState()->pageLogicalHeight()) |
- setPageLogicalOffset( |
- layoutView->layoutState()->pageLogicalOffset(*this, logicalTop())); |
- |
updateLayerTransformAfterLayout(); |
updateAfterLayout(); |
@@ -780,10 +775,12 @@ bool LayoutBlockFlow::positionAndLayoutOnceIfNeeded( |
} |
} |
- if (!child.needsLayout()) |
- return false; |
- child.layout(); |
- return true; |
+ bool neededLayout = child.needsLayout(); |
+ if (neededLayout) |
+ child.layout(); |
+ if (view()->layoutState()->isPaginated()) |
+ updateFragmentationInfoForChild(child); |
+ return neededLayout; |
} |
void LayoutBlockFlow::insertForcedBreakBeforeChildIfNeeded( |