Index: Source/core/rendering/RenderObject.cpp |
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp |
index cac02b961ddc8990c3d1093eaacc9612dcce053f..ed9585fe0f2c3cdeaff5780f28c637af60d38eae 100644 |
--- a/Source/core/rendering/RenderObject.cpp |
+++ b/Source/core/rendering/RenderObject.cpp |
@@ -1596,7 +1596,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. |
@@ -2621,7 +2621,8 @@ 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()->isFirstLetterPseudoElement()) { |
RenderStyle* parentStyle = rendererForFirstLineStyle->parent()->firstLineStyle(); |
if (parentStyle != rendererForFirstLineStyle->parent()->style()) { |
if (type == Cached) { |