Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: Source/core/rendering/RenderObject.cpp

Issue 571603003: Convert first letter into a pseudo element. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase to master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index af60bc8dd846a6675e11db68a909bf99104f7cb2..dd022946e2d894467f1be0c3c4fcafca5d092f0e 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -1633,7 +1633,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.
@@ -2655,7 +2655,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())) {
Julien - ping for review 2014/10/09 18:24:48 rendererForFirstLineStyle->node() will only return
dsinclair 2014/10/09 21:14:22 Done.
+
RenderStyle* parentStyle = rendererForFirstLineStyle->parent()->firstLineStyle();
if (parentStyle != rendererForFirstLineStyle->parent()->style()) {
if (type == Cached) {

Powered by Google App Engine
This is Rietveld 408576698