From 5ddde30071f639962dd557c453f2ad01f8f0fd00 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 8 Sep 2010 12:18:00 +0100 Subject: Merge WebKit at r66666 : Initial merge by git. Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f --- WebCore/rendering/RenderListItem.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'WebCore/rendering/RenderListItem.cpp') diff --git a/WebCore/rendering/RenderListItem.cpp b/WebCore/rendering/RenderListItem.cpp index f861467..2366a34 100644 --- a/WebCore/rendering/RenderListItem.cpp +++ b/WebCore/rendering/RenderListItem.cpp @@ -150,6 +150,7 @@ static RenderObject* getParentOfFirstLineBox(RenderBlock* curr, RenderObject* ma if (!firstChild) return 0; + bool inQuirksMode = curr->document()->inQuirksMode(); for (RenderObject* currChild = firstChild; currChild; currChild = currChild->nextSibling()) { if (currChild == marker) continue; @@ -163,7 +164,7 @@ static RenderObject* getParentOfFirstLineBox(RenderBlock* curr, RenderObject* ma if (currChild->isTable() || !currChild->isRenderBlock()) break; - if (curr->isListItem() && currChild->style()->htmlHacks() && currChild->node() && + if (curr->isListItem() && inQuirksMode && currChild->node() && (currChild->node()->hasTagName(ulTag)|| currChild->node()->hasTagName(olTag))) break; -- cgit v1.1