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

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 1612 matching lines...) Expand 10 before | Expand all | Expand 10 after
1623 if (diff.needsPaintInvalidationLayer() && !hasLayer()) { 1623 if (diff.needsPaintInvalidationLayer() && !hasLayer()) {
1624 diff.clearNeedsPaintInvalidation(); 1624 diff.clearNeedsPaintInvalidation();
1625 diff.setNeedsPaintInvalidationObject(); 1625 diff.setNeedsPaintInvalidationObject();
1626 } 1626 }
1627 1627
1628 return diff; 1628 return diff;
1629 } 1629 }
1630 1630
1631 void RenderObject::setPseudoStyle(PassRefPtr<RenderStyle> pseudoStyle) 1631 void RenderObject::setPseudoStyle(PassRefPtr<RenderStyle> pseudoStyle)
1632 { 1632 {
1633 ASSERT(pseudoStyle->styleType() == BEFORE || pseudoStyle->styleType() == AFT ER); 1633 ASSERT(pseudoStyle->styleType() == BEFORE || pseudoStyle->styleType() == AFT ER || pseudoStyle->styleType() == FIRST_LETTER);
1634 1634
1635 // FIXME: We should consider just making all pseudo items use an inherited s tyle. 1635 // FIXME: We should consider just making all pseudo items use an inherited s tyle.
1636 1636
1637 // Images are special and must inherit the pseudoStyle so the width and heig ht of 1637 // Images are special and must inherit the pseudoStyle so the width and heig ht of
1638 // the pseudo element doesn't change the size of the image. In all other cas es we 1638 // the pseudo element doesn't change the size of the image. In all other cas es we
1639 // can just share the style. 1639 // can just share the style.
1640 // 1640 //
1641 // Quotes are also RenderInline, so we need to create an inherited style to avoid 1641 // Quotes are also RenderInline, so we need to create an inherited style to avoid
1642 // getting an inline with positioning or an invalid display. 1642 // getting an inline with positioning or an invalid display.
1643 // 1643 //
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after
2648 const RenderObject* rendererForFirstLineStyle = renderer; 2648 const RenderObject* rendererForFirstLineStyle = renderer;
2649 if (renderer->isBeforeOrAfterContent()) 2649 if (renderer->isBeforeOrAfterContent())
2650 rendererForFirstLineStyle = renderer->parent(); 2650 rendererForFirstLineStyle = renderer->parent();
2651 2651
2652 if (rendererForFirstLineStyle->isRenderBlockFlow() || rendererForFirstLineSt yle->isRenderButton()) { 2652 if (rendererForFirstLineStyle->isRenderBlockFlow() || rendererForFirstLineSt yle->isRenderButton()) {
2653 if (RenderBlock* firstLineBlock = rendererForFirstLineStyle->firstLineBl ock()) { 2653 if (RenderBlock* firstLineBlock = rendererForFirstLineStyle->firstLineBl ock()) {
2654 if (type == Cached) 2654 if (type == Cached)
2655 return firstLineBlock->getCachedPseudoStyle(FIRST_LINE, style); 2655 return firstLineBlock->getCachedPseudoStyle(FIRST_LINE, style);
2656 return firstLineBlock->getUncachedPseudoStyle(PseudoStyleRequest(FIR ST_LINE), style, firstLineBlock == renderer ? style : 0); 2656 return firstLineBlock->getUncachedPseudoStyle(PseudoStyleRequest(FIR ST_LINE), style, firstLineBlock == renderer ? style : 0);
2657 } 2657 }
2658 } else if (!rendererForFirstLineStyle->isAnonymous() && rendererForFirstLine Style->isRenderInline()) { 2658 } else if (!rendererForFirstLineStyle->isAnonymous() && rendererForFirstLine Style->isRenderInline()
2659 && !rendererForFirstLineStyle->node()->isFirstLetterPseudoElement()) {
2659 RenderStyle* parentStyle = rendererForFirstLineStyle->parent()->firstLin eStyle(); 2660 RenderStyle* parentStyle = rendererForFirstLineStyle->parent()->firstLin eStyle();
2660 if (parentStyle != rendererForFirstLineStyle->parent()->style()) { 2661 if (parentStyle != rendererForFirstLineStyle->parent()->style()) {
2661 if (type == Cached) { 2662 if (type == Cached) {
2662 // A first-line style is in effect. Cache a first-line style for ourselves. 2663 // A first-line style is in effect. Cache a first-line style for ourselves.
2663 rendererForFirstLineStyle->style()->setHasPseudoStyle(FIRST_LINE _INHERITED); 2664 rendererForFirstLineStyle->style()->setHasPseudoStyle(FIRST_LINE _INHERITED);
2664 return rendererForFirstLineStyle->getCachedPseudoStyle(FIRST_LIN E_INHERITED, parentStyle); 2665 return rendererForFirstLineStyle->getCachedPseudoStyle(FIRST_LIN E_INHERITED, parentStyle);
2665 } 2666 }
2666 return rendererForFirstLineStyle->getUncachedPseudoStyle(PseudoStyle Request(FIRST_LINE_INHERITED), parentStyle, style); 2667 return rendererForFirstLineStyle->getUncachedPseudoStyle(PseudoStyle Request(FIRST_LINE_INHERITED), parentStyle, style);
2667 } 2668 }
2668 } 2669 }
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
3185 { 3186 {
3186 if (object1) { 3187 if (object1) {
3187 const blink::RenderObject* root = object1; 3188 const blink::RenderObject* root = object1;
3188 while (root->parent()) 3189 while (root->parent())
3189 root = root->parent(); 3190 root = root->parent();
3190 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3191 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3191 } 3192 }
3192 } 3193 }
3193 3194
3194 #endif 3195 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698