diff options
| author | Rob Tsuk <robtsuk@google.com> | 2010-12-01 13:59:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-01 13:59:11 -0800 |
| commit | 1fc015f0ce86a2bed612d2eec53b01cac6b8a793 (patch) | |
| tree | b3c4fc3c54b7a72607b4019c18f88078a4a54aec /WebCore | |
| parent | e5097951a2019ae742b9c348b21e613631f59cdc (diff) | |
| parent | 4741f41129460f4c8cdca5df12a38305f38945d0 (diff) | |
| download | external_webkit-1fc015f0ce86a2bed612d2eec53b01cac6b8a793.zip external_webkit-1fc015f0ce86a2bed612d2eec53b01cac6b8a793.tar.gz external_webkit-1fc015f0ce86a2bed612d2eec53b01cac6b8a793.tar.bz2 | |
am 4741f411: Do not merge.
* commit '4741f41129460f4c8cdca5df12a38305f38945d0':
Do not merge.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/rendering/RenderBlock.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp index b720488..c209e36 100644 --- a/WebCore/rendering/RenderBlock.cpp +++ b/WebCore/rendering/RenderBlock.cpp @@ -541,6 +541,7 @@ void RenderBlock::removeChild(RenderObject* oldChild) bool canDeleteAnonymousBlocks = !documentBeingDestroyed() && !isInline() && !oldChild->isInline() && (!oldChild->isRenderBlock() || !toRenderBlock(oldChild)->inlineContinuation()) && (!prev || (prev->isAnonymousBlock() && prev->childrenInline())) && + (!prev || (!prev->firstChild() || !prev->firstChild()->isInline() || !prev->firstChild()->isRunIn())) && (!next || (next->isAnonymousBlock() && next->childrenInline())); if (canDeleteAnonymousBlocks && prev && next) { // Take all the children out of the |next| block and put them in |