diff options
author | Steve Block <steveblock@google.com> | 2012-04-27 19:35:57 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-04-27 19:42:46 +0100 |
commit | 35acba539f15b03afbe4071047898b72153fa1a8 (patch) | |
tree | 161bb617ffaf6349267c974116edd32df73c3347 /Source | |
parent | 1711ae858c31e6ade43a99517f3cb5b358a2cb5f (diff) | |
download | external_webkit-35acba539f15b03afbe4071047898b72153fa1a8.zip external_webkit-35acba539f15b03afbe4071047898b72153fa1a8.tar.gz external_webkit-35acba539f15b03afbe4071047898b72153fa1a8.tar.bz2 |
Cherry-pick WebKit change r96294 as a prerequisite for r98561
See http://trac.webkit.org/changeset/96294
Bug: 6329121
Change-Id: If5e731adc2751a8fc55a7baa3d7c205f47964b17
Diffstat (limited to 'Source')
-rw-r--r-- | Source/WebCore/rendering/RenderBlock.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp index 49dd169..7a6ec82 100644 --- a/Source/WebCore/rendering/RenderBlock.cpp +++ b/Source/WebCore/rendering/RenderBlock.cpp @@ -5380,21 +5380,23 @@ void RenderBlock::updateFirstLetter() // Drill into inlines looking for our first text child. RenderObject* currChild = firstLetterBlock->firstChild(); - while (currChild && ((!currChild->isReplaced() && !currChild->isRenderButton() && !currChild->isMenuList()) || currChild->isFloatingOrPositioned()) && !currChild->isText()) { - if (currChild->isFloatingOrPositioned()) { + while (currChild) { + if (currChild->isText()) + break; + if (currChild->isListMarker()) + currChild = currChild->nextSibling(); + else if (currChild->isFloatingOrPositioned()) { if (currChild->style()->styleType() == FIRST_LETTER) { currChild = currChild->firstChild(); break; - } + } currChild = currChild->nextSibling(); - } else + } else if (currChild->isReplaced() || currChild->isRenderButton() || currChild->isMenuList()) + break; + else currChild = currChild->firstChild(); } - // Get list markers out of the way. - while (currChild && currChild->isListMarker()) - currChild = currChild->nextSibling(); - if (!currChild) return; |