Index: Source/core/rendering/RenderBlock.cpp |
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp |
index d682abab11789e1068a1b47da22ade31ee1f07cc..8333e6d0418fe38920c5a009a8774a2b5b69f12f 100644 |
--- a/Source/core/rendering/RenderBlock.cpp |
+++ b/Source/core/rendering/RenderBlock.cpp |
@@ -1387,6 +1387,9 @@ void RenderBlock::layout() |
// layoutBlock(). |
layoutBlock(false); |
+ if (frameView()->shouldStopPartialLayout()) |
+ return; |
+ |
// It's safe to check for control clip here, since controls can never be table cells. |
// If we have a lightweight clip, there can never be any overflow from children. |
if (hasControlClip() && m_overflow) |
@@ -1597,6 +1600,11 @@ void RenderBlock::layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeigh |
else |
layoutBlockChildren(relayoutChildren, maxFloatLogicalBottom, layoutScope); |
+ if (frameView()->shouldStopPartialLayout()) { |
+ statePusher.pop(); |
eseidel
2013/08/20 21:00:39
gnarly.
esprehn
2013/08/23 20:47:27
It's really weird that LayoutStateMaintainer doesn
|
+ return; |
+ } |
+ |
// Expand our intrinsic height to encompass floats. |
LayoutUnit toAdd = borderAfter() + paddingAfter() + scrollbarLogicalHeight(); |
if (lowestFloatLogicalBottom() > (logicalHeight() - toAdd) && expandsToEncloseOverhangingFloats()) |
@@ -1644,6 +1652,9 @@ void RenderBlock::layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeigh |
fitBorderToLinesIfNeeded(); |
+ if (frameView()->shouldStopPartialLayout()) |
+ return; |
+ |
if (renderView->layoutState()->m_pageLogicalHeight) |
setPageLogicalOffset(renderView->layoutState()->pageLogicalOffset(this, logicalTop())); |
@@ -2516,6 +2527,9 @@ void RenderBlock::layoutBlockChildren(bool relayoutChildren, LayoutUnit& maxFloa |
// Lay out the child. |
layoutBlockChild(child, marginInfo, previousFloatLogicalBottom, maxFloatLogicalBottom); |
+ |
+ if (frameView()->checkPartialLayoutComplete(child)) |
eseidel
2013/08/20 21:00:39
You should add a comment as to why.
pdr.
2013/08/26 05:50:40
Done.
|
+ break; |
} |
// Now do the handling of the bottom of the block, adding in our bottom border/padding and |
@@ -2581,6 +2595,9 @@ void RenderBlock::layoutBlockChild(RenderBox* child, MarginInfo& marginInfo, Lay |
if (childNeededLayout) |
child->layout(); |
+ if (document()->view()->shouldStopPartialLayout()) |
esprehn
2013/08/23 20:47:27
frameView()
pdr.
2013/08/26 05:50:40
Done.
|
+ return; |
+ |
// Cache if we are at the top of the block right now. |
bool atBeforeSideOfBlock = marginInfo.atBeforeSideOfBlock(); |