| Index: Source/core/rendering/RenderObject.cpp
|
| diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
|
| index 92b4fa70f24865aa9529cb8bd4227336c70d6d2d..088afba63870e2a1892549ee779009dd9b8d7749 100644
|
| --- a/Source/core/rendering/RenderObject.cpp
|
| +++ b/Source/core/rendering/RenderObject.cpp
|
| @@ -1634,7 +1634,7 @@ StyleDifference RenderObject::adjustStyleDifference(StyleDifference diff) const
|
|
|
| void RenderObject::setPseudoStyle(PassRefPtr<RenderStyle> pseudoStyle)
|
| {
|
| - ASSERT(pseudoStyle->styleType() == BEFORE || pseudoStyle->styleType() == AFTER);
|
| + ASSERT(pseudoStyle->styleType() == BEFORE || pseudoStyle->styleType() == AFTER || pseudoStyle->styleType() == FIRST_LETTER);
|
|
|
| // FIXME: We should consider just making all pseudo items use an inherited style.
|
|
|
| @@ -2656,7 +2656,9 @@ static PassRefPtr<RenderStyle> firstLineStyleForCachedUncachedType(StyleCacheSta
|
| return firstLineBlock->getCachedPseudoStyle(FIRST_LINE, style);
|
| return firstLineBlock->getUncachedPseudoStyle(PseudoStyleRequest(FIRST_LINE), style, firstLineBlock == renderer ? style : 0);
|
| }
|
| - } else if (!rendererForFirstLineStyle->isAnonymous() && rendererForFirstLineStyle->isRenderInline()) {
|
| + } else if (!rendererForFirstLineStyle->isAnonymous() && rendererForFirstLineStyle->isRenderInline()
|
| + && (!rendererForFirstLineStyle->node() || !rendererForFirstLineStyle->node()->isFirstLetterPseudoElement())) {
|
| +
|
| RenderStyle* parentStyle = rendererForFirstLineStyle->parent()->firstLineStyle();
|
| if (parentStyle != rendererForFirstLineStyle->parent()->style()) {
|
| if (type == Cached) {
|
|
|