diff options
author | John Reck <jreck@google.com> | 2011-10-21 13:59:21 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-21 13:59:21 -0700 |
commit | 686c16a0cf5238ab24da8f229e3bf84e6510ee68 (patch) | |
tree | c6d437bcad49fca09b82566c14e934925dd8db8d | |
parent | ed040c45380a4cdedc8c4024c355eb72db755eae (diff) | |
parent | 5236e6a2f70997cf9dec9e93261867dd79b21738 (diff) | |
download | external_webkit-686c16a0cf5238ab24da8f229e3bf84e6510ee68.zip external_webkit-686c16a0cf5238ab24da8f229e3bf84e6510ee68.tar.gz external_webkit-686c16a0cf5238ab24da8f229e3bf84e6510ee68.tar.bz2 |
am 5236e6a2: Merge "Cherry pick 94857" into ics-mr0
* commit '5236e6a2f70997cf9dec9e93261867dd79b21738':
Cherry pick 94857
-rw-r--r-- | Source/WebCore/rendering/RenderObjectChildList.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderObjectChildList.cpp b/Source/WebCore/rendering/RenderObjectChildList.cpp index 1ea8675..b6c7992 100644 --- a/Source/WebCore/rendering/RenderObjectChildList.cpp +++ b/Source/WebCore/rendering/RenderObjectChildList.cpp @@ -271,7 +271,12 @@ RenderObject* RenderObjectChildList::beforePseudoElementRenderer(const RenderObj do { // Skip list markers and generated run-ins first = first->firstChild(); - while (first && (first->isListMarker() || (first->isRenderInline() && first->isRunIn() && first->isAnonymous()))) + while (first && first->isListMarker()) { + if (first->parent() != owner && first->parent()->isAnonymousBlock()) + first = first->parent(); + first = first->nextSibling(); + } + while (first && first->isRenderInline() && first->isRunIn()) first = first->nextSibling(); } while (first && first->isAnonymous() && first->style()->styleType() == NOPSEUDO); @@ -293,7 +298,7 @@ RenderObject* RenderObjectChildList::beforePseudoElementRenderer(const RenderObj // We still need to skip any list markers that could exist before the run-in. while (first && first->isListMarker()) first = first->nextSibling(); - if (first && first->style()->styleType() == BEFORE && first->isRenderInline() && first->isRunIn() && first->isAnonymous()) + if (first && first->style()->styleType() == BEFORE && first->isRenderInline() && first->isRunIn()) return first; } return 0; |