diff options
author | John Reck <jreck@google.com> | 2011-10-21 10:06:23 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-21 10:06:23 -0700 |
commit | 5236e6a2f70997cf9dec9e93261867dd79b21738 (patch) | |
tree | 7a01ddafc3cde2edc5b15fc43b9ba9f28b66f87f /Source | |
parent | 6032fa428d725097ea29fc85fc1b2c965094772b (diff) | |
parent | 2190c2d4386e3783d331c0bcf01774d466d08aac (diff) | |
download | external_webkit-5236e6a2f70997cf9dec9e93261867dd79b21738.zip external_webkit-5236e6a2f70997cf9dec9e93261867dd79b21738.tar.gz external_webkit-5236e6a2f70997cf9dec9e93261867dd79b21738.tar.bz2 |
Merge "Cherry pick 94857" into ics-mr0
Diffstat (limited to 'Source')
-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; |