Index: Source/core/rendering/RenderBlock.cpp |
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp |
index 3236fff5313b2a16e790d163ebeb88e54ca2d988..a6266d15aa43d738a46eb72ff82cae208f8c99ca 100644 |
--- a/Source/core/rendering/RenderBlock.cpp |
+++ b/Source/core/rendering/RenderBlock.cpp |
@@ -3998,7 +3998,7 @@ static inline RenderObject* findFirstLetterBlock(RenderBlock* start) |
// of flexbox. |
bool canHaveFirstLetterRenderer = firstLetterBlock->style()->hasPseudoStyle(FIRST_LETTER) |
&& firstLetterBlock->canHaveGeneratedChildren() |
- && (!firstLetterBlock->isFlexibleBox() || firstLetterBlock->isRenderButton()); |
+ && (firstLetterBlock->isRenderBlockFlow() || firstLetterBlock->isRenderButton()); |
if (canHaveFirstLetterRenderer) |
return firstLetterBlock; |
@@ -4176,7 +4176,7 @@ void RenderBlock::updateFirstLetter() |
break; |
} |
currChild = currChild->nextSibling(); |
- } else if (currChild->isReplaced() || currChild->isRenderButton() || currChild->isMenuList()) { |
+ } else if (currChild->isReplaced() || currChild->isRenderButton() || currChild->isMenuList() || (!firstLetterBlock->isRenderBlockFlow() && !firstLetterBlock->isRenderButton())) { |
Julien - ping for review
2014/08/07 20:55:57
This is repeated several now so we should put it i
Manuel Rego
2014/08/07 22:19:47
Done.
|
break; |
} else if (currChild->style()->hasPseudoStyle(FIRST_LETTER) && currChild->canHaveGeneratedChildren()) { |
// We found a lower-level node with first-letter, which supersedes the higher-level style |