| Index: Source/core/rendering/RenderBlockFlow.cpp
|
| diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
|
| index 1cf8fe1be07ffea7f5bec28804addcbb4dcd723c..7bbe7331802534f0a3b86e5500cdf4a926e59412 100644
|
| --- a/Source/core/rendering/RenderBlockFlow.cpp
|
| +++ b/Source/core/rendering/RenderBlockFlow.cpp
|
| @@ -448,6 +448,7 @@ inline bool RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit &
|
| // Add overflow from children (unless we're multi-column, since in that case all our child overflow is clipped anyway).
|
| computeOverflow(oldClientAfterEdge);
|
|
|
| + m_descendantsWithFloatsMarkedForLayout = false;
|
| return true;
|
| }
|
|
|
| @@ -1692,6 +1693,10 @@ void RenderBlockFlow::markAllDescendantsWithFloatsForLayout(RenderBox* floatToRe
|
| if (!everHadLayout() && !containsFloats())
|
| return;
|
|
|
| + if (m_descendantsWithFloatsMarkedForLayout && !floatToRemove)
|
| + return;
|
| + m_descendantsWithFloatsMarkedForLayout = m_descendantsWithFloatsMarkedForLayout || !floatToRemove;
|
| +
|
| MarkingBehavior markParents = inLayout ? MarkOnlyThis : MarkContainingBlockChain;
|
| setChildNeedsLayout(markParents);
|
|
|
|
|