summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/rendering/RenderBox.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index 92c3d99..4c857c9 100644
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -116,8 +116,13 @@ void RenderBox::removeFloatingOrPositionedChildFromBlockLists()
outermostBlock = p;
}
- if (outermostBlock)
+ if (outermostBlock) {
+ RenderObject* parent = outermostBlock->parent();
+ if (parent && parent->isFlexibleBox())
+ outermostBlock = toRenderBlock(parent);
+
outermostBlock->markAllDescendantsWithFloatsForLayout(this, false);
+ }
}
if (isPositioned()) {