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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 672953002: Convert first letter into a pseudo element. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1607 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 if (diff.needsPaintInvalidationLayer() && !hasLayer()) { 1618 if (diff.needsPaintInvalidationLayer() && !hasLayer()) {
1619 diff.clearNeedsPaintInvalidation(); 1619 diff.clearNeedsPaintInvalidation();
1620 diff.setNeedsPaintInvalidationObject(); 1620 diff.setNeedsPaintInvalidationObject();
1621 } 1621 }
1622 1622
1623 return diff; 1623 return diff;
1624 } 1624 }
1625 1625
1626 void RenderObject::setPseudoStyle(PassRefPtr<RenderStyle> pseudoStyle) 1626 void RenderObject::setPseudoStyle(PassRefPtr<RenderStyle> pseudoStyle)
1627 { 1627 {
1628 ASSERT(pseudoStyle->styleType() == BEFORE || pseudoStyle->styleType() == AFT ER); 1628 ASSERT(pseudoStyle->styleType() == BEFORE || pseudoStyle->styleType() == AFT ER || pseudoStyle->styleType() == FIRST_LETTER);
1629 1629
1630 // FIXME: We should consider just making all pseudo items use an inherited s tyle. 1630 // FIXME: We should consider just making all pseudo items use an inherited s tyle.
1631 1631
1632 // Images are special and must inherit the pseudoStyle so the width and heig ht of 1632 // Images are special and must inherit the pseudoStyle so the width and heig ht of
1633 // the pseudo element doesn't change the size of the image. In all other cas es we 1633 // the pseudo element doesn't change the size of the image. In all other cas es we
1634 // can just share the style. 1634 // can just share the style.
1635 // 1635 //
1636 // Quotes are also RenderInline, so we need to create an inherited style to avoid 1636 // Quotes are also RenderInline, so we need to create an inherited style to avoid
1637 // getting an inline with positioning or an invalid display. 1637 // getting an inline with positioning or an invalid display.
1638 // 1638 //
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after
2643 const RenderObject* rendererForFirstLineStyle = renderer; 2643 const RenderObject* rendererForFirstLineStyle = renderer;
2644 if (renderer->isBeforeOrAfterContent()) 2644 if (renderer->isBeforeOrAfterContent())
2645 rendererForFirstLineStyle = renderer->parent(); 2645 rendererForFirstLineStyle = renderer->parent();
2646 2646
2647 if (rendererForFirstLineStyle->isRenderBlockFlow() || rendererForFirstLineSt yle->isRenderButton()) { 2647 if (rendererForFirstLineStyle->isRenderBlockFlow() || rendererForFirstLineSt yle->isRenderButton()) {
2648 if (RenderBlock* firstLineBlock = rendererForFirstLineStyle->firstLineBl ock()) { 2648 if (RenderBlock* firstLineBlock = rendererForFirstLineStyle->firstLineBl ock()) {
2649 if (type == Cached) 2649 if (type == Cached)
2650 return firstLineBlock->getCachedPseudoStyle(FIRST_LINE, style); 2650 return firstLineBlock->getCachedPseudoStyle(FIRST_LINE, style);
2651 return firstLineBlock->getUncachedPseudoStyle(PseudoStyleRequest(FIR ST_LINE), style, firstLineBlock == renderer ? style : 0); 2651 return firstLineBlock->getUncachedPseudoStyle(PseudoStyleRequest(FIR ST_LINE), style, firstLineBlock == renderer ? style : 0);
2652 } 2652 }
2653 } else if (!rendererForFirstLineStyle->isAnonymous() && rendererForFirstLine Style->isRenderInline()) { 2653 } else if (!rendererForFirstLineStyle->isAnonymous() && rendererForFirstLine Style->isRenderInline()
2654 && !rendererForFirstLineStyle->node()->isFirstLetterPseudoElement()) {
2654 RenderStyle* parentStyle = rendererForFirstLineStyle->parent()->firstLin eStyle(); 2655 RenderStyle* parentStyle = rendererForFirstLineStyle->parent()->firstLin eStyle();
2655 if (parentStyle != rendererForFirstLineStyle->parent()->style()) { 2656 if (parentStyle != rendererForFirstLineStyle->parent()->style()) {
2656 if (type == Cached) { 2657 if (type == Cached) {
2657 // A first-line style is in effect. Cache a first-line style for ourselves. 2658 // A first-line style is in effect. Cache a first-line style for ourselves.
2658 rendererForFirstLineStyle->style()->setHasPseudoStyle(FIRST_LINE _INHERITED); 2659 rendererForFirstLineStyle->style()->setHasPseudoStyle(FIRST_LINE _INHERITED);
2659 return rendererForFirstLineStyle->getCachedPseudoStyle(FIRST_LIN E_INHERITED, parentStyle); 2660 return rendererForFirstLineStyle->getCachedPseudoStyle(FIRST_LIN E_INHERITED, parentStyle);
2660 } 2661 }
2661 return rendererForFirstLineStyle->getUncachedPseudoStyle(PseudoStyle Request(FIRST_LINE_INHERITED), parentStyle, style); 2662 return rendererForFirstLineStyle->getUncachedPseudoStyle(PseudoStyle Request(FIRST_LINE_INHERITED), parentStyle, style);
2662 } 2663 }
2663 } 2664 }
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
3176 { 3177 {
3177 if (object1) { 3178 if (object1) {
3178 const blink::RenderObject* root = object1; 3179 const blink::RenderObject* root = object1;
3179 while (root->parent()) 3180 while (root->parent())
3180 root = root->parent(); 3181 root = root->parent();
3181 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3182 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3182 } 3183 }
3183 } 3184 }
3184 3185
3185 #endif 3186 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698