diff options
| author | John Reck <jreck@google.com> | 2011-10-20 15:26:23 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-10-20 15:26:23 -0700 |
| commit | 9a26d18f4c7e98b479be700575d003f873214550 (patch) | |
| tree | 82b4ea54125890b6dd28f32a86ef4d43c9d08e8a /Source/WebCore/rendering/RenderBlock.cpp | |
| parent | 2190c2d4386e3783d331c0bcf01774d466d08aac (diff) | |
| download | external_webkit-9a26d18f4c7e98b479be700575d003f873214550.zip external_webkit-9a26d18f4c7e98b479be700575d003f873214550.tar.gz external_webkit-9a26d18f4c7e98b479be700575d003f873214550.tar.bz2 | |
Cherry pick 97075
Bug: 5491444
Change-Id: If97d58a3d590e8e972bceec61e3ae16860a30088
Diffstat (limited to 'Source/WebCore/rendering/RenderBlock.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderBlock.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp index 8fa021f..373523d 100644 --- a/Source/WebCore/rendering/RenderBlock.cpp +++ b/Source/WebCore/rendering/RenderBlock.cpp @@ -1554,13 +1554,9 @@ bool RenderBlock::handleRunInChild(RenderBox* child) if (!child->isRenderBlock()) return false; - // Get the next non-positioned/non-floating RenderBlock. RenderBlock* blockRunIn = toRenderBlock(child); RenderObject* curr = blockRunIn->nextSibling(); - while (curr && curr->isFloatingOrPositioned()) - curr = curr->nextSibling(); - - if (!curr || !curr->isRenderBlock() || !curr->childrenInline() || curr->isRunIn() || curr->isAnonymous()) + if (!curr || !curr->isRenderBlock() || !curr->childrenInline() || curr->isRunIn() || curr->isAnonymous() || curr->isFloatingOrPositioned()) return false; RenderBlock* currBlock = toRenderBlock(curr); |