Title: [95426] branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp
- Revision
- 95426
- Author
- infe...@chromium.org
- Date
- 2011-09-19 09:49:29 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94857
BUG=95672
Review URL: http://codereview.chromium.org/7946005
Modified Paths
Diff
Modified: branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp (95425 => 95426)
--- branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp 2011-09-19 16:47:32 UTC (rev 95425)
+++ branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp 2011-09-19 16:49:29 UTC (rev 95426)
@@ -299,8 +299,13 @@
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);
if (!first)
@@ -321,7 +326,7 @@
// 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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
