diff options
| author | Steve Block <steveblock@google.com> | 2012-04-27 19:37:11 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-27 19:42:46 +0100 |
| commit | 0b6461e8a4be51c556f77873d5ec18767cb26f58 (patch) | |
| tree | 48ebc2ead2c4d532f65102503e7221523f7e431e /Source/WebCore/rendering | |
| parent | 35acba539f15b03afbe4071047898b72153fa1a8 (diff) | |
| download | external_webkit-0b6461e8a4be51c556f77873d5ec18767cb26f58.zip external_webkit-0b6461e8a4be51c556f77873d5ec18767cb26f58.tar.gz external_webkit-0b6461e8a4be51c556f77873d5ec18767cb26f58.tar.bz2 | |
Cherry-pick WebKit change r98561 to fix a rendering crash
See http://trac.webkit.org/changeset/98561
Bug: 6329121
Change-Id: Ie015bf4cc144cd2514d687202e1b247f9ca0799b
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/RenderBlock.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp index 7a6ec82..86d8a98 100644 --- a/Source/WebCore/rendering/RenderBlock.cpp +++ b/Source/WebCore/rendering/RenderBlock.cpp @@ -5393,6 +5393,11 @@ void RenderBlock::updateFirstLetter() currChild = currChild->nextSibling(); } else if (currChild->isReplaced() || currChild->isRenderButton() || currChild->isMenuList()) break; + else if (currChild->style()->hasPseudoStyle(FIRST_LETTER) && currChild->canHaveChildren()) { + // We found a lower-level node with first-letter, which supersedes the higher-level style + firstLetterBlock = currChild; + currChild = currChild->firstChild(); + } else currChild = currChild->firstChild(); } |