diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-21 11:46:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 11:46:15 -0700 |
| commit | 122a6b03f21c5ec726d905d08531bdb8f1c7a376 (patch) | |
| tree | 2d7b3b7988a72bc02590628d086da48b0ae12f37 /WebCore | |
| parent | d377cc767167c529a2effc0b1740b31f01ba6f9d (diff) | |
| parent | 910dc2ab50b8f32067f7b45f9e46d26a2aa681c6 (diff) | |
| download | external_webkit-122a6b03f21c5ec726d905d08531bdb8f1c7a376.zip external_webkit-122a6b03f21c5ec726d905d08531bdb8f1c7a376.tar.gz external_webkit-122a6b03f21c5ec726d905d08531bdb8f1c7a376.tar.bz2 | |
am 910dc2ab: Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
Merge commit '910dc2ab50b8f32067f7b45f9e46d26a2aa681c6' into gingerbread-plus-aosp
* commit '910dc2ab50b8f32067f7b45f9e46d26a2aa681c6':
Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/rendering/RenderBox.cpp | 7 |
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()) { |