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

Side by Side Diff: Source/core/dom/RenderTreeBuilder.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 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) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
7 * Copyright (C) 2011 Google Inc. All rights reserved. 7 * Copyright (C) 2011 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 11 matching lines...) Expand all
22 * Boston, MA 02110-1301, USA. 22 * Boston, MA 02110-1301, USA.
23 * 23 *
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/dom/RenderTreeBuilder.h" 27 #include "core/dom/RenderTreeBuilder.h"
28 28
29 #include "core/HTMLNames.h" 29 #include "core/HTMLNames.h"
30 #include "core/SVGNames.h" 30 #include "core/SVGNames.h"
31 #include "core/css/resolver/StyleResolver.h" 31 #include "core/css/resolver/StyleResolver.h"
32 #include "core/dom/FirstLetterPseudoElement.h"
32 #include "core/dom/Fullscreen.h" 33 #include "core/dom/Fullscreen.h"
33 #include "core/dom/Node.h" 34 #include "core/dom/Node.h"
35 #include "core/dom/PseudoElement.h"
34 #include "core/dom/Text.h" 36 #include "core/dom/Text.h"
35 #include "core/rendering/RenderFullScreen.h" 37 #include "core/rendering/RenderFullScreen.h"
36 #include "core/rendering/RenderObject.h" 38 #include "core/rendering/RenderObject.h"
37 #include "core/rendering/RenderText.h" 39 #include "core/rendering/RenderText.h"
38 #include "core/rendering/RenderView.h" 40 #include "core/rendering/RenderView.h"
39 #include "core/svg/SVGElement.h" 41 #include "core/svg/SVGElement.h"
40 #include "platform/RuntimeEnabledFeatures.h" 42 #include "platform/RuntimeEnabledFeatures.h"
41 43
42 namespace blink { 44 namespace blink {
43 45
44 RenderObject* RenderTreeBuilder::nextRenderer() const 46 RenderObject* RenderTreeBuilder::nextRenderer() const
45 { 47 {
46 ASSERT(m_renderingParent); 48 ASSERT(m_renderingParent);
47 49
48 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; 50 Element* element = m_node->isElementNode() ? toElement(m_node) : 0;
49 51
50 if (element && element->isInTopLayer()) 52 if (element && element->isInTopLayer())
51 return NodeRenderingTraversal::nextInTopLayer(element); 53 return NodeRenderingTraversal::nextInTopLayer(element);
52 54
53 // Avoid an O(N^2) walk over the children when reattaching all children of a node. 55 // Avoid an O(N^2) walk over the children when reattaching all children of a node.
54 if (m_renderingParent->needsAttach()) 56 if (m_renderingParent->needsAttach())
Julien - ping for review 2014/10/09 18:24:48 You're checking m_renderingParent->needsAttach() f
dsinclair 2014/10/09 21:14:22 Are you saying this is an existing issue, or due t
Julien - ping for review 2014/10/10 14:47:07 I was confused by the logic actually and we have t
dsinclair 2014/10/10 18:06:53 Acknowledged.
55 return 0; 57 return 0;
56 58
59 if (element && element->isFirstLetterPseudoElement())
60 return FirstLetterPseudoElement::firstLetterTextRenderer(*element);
Julien - ping for review 2014/10/09 18:24:48 If we keep the code in parentRenderer(), there is
dsinclair 2014/10/09 21:14:22 In what cases is there a top layer? Is this someth
Julien - ping for review 2014/10/10 14:47:07 top layer is a DOM Element API so it won't happen
dsinclair 2014/10/10 18:06:52 Code removed from parentRenderer().
61
57 return NodeRenderingTraversal::nextSiblingRenderer(m_node); 62 return NodeRenderingTraversal::nextSiblingRenderer(m_node);
58 } 63 }
59 64
60 RenderObject* RenderTreeBuilder::parentRenderer() const 65 RenderObject* RenderTreeBuilder::parentRenderer() const
61 { 66 {
62 ASSERT(m_renderingParent); 67 ASSERT(m_renderingParent);
63 68
64 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; 69 Element* element = m_node->isElementNode() ? toElement(m_node) : 0;
65 70
71 if (element && element->isFirstLetterPseudoElement()) {
72 RenderObject* nextRenderer = FirstLetterPseudoElement::firstLetterTextRe nderer(*element);
73 return nextRenderer ? nextRenderer->parent() : nullptr;
74 }
75
66 if (element && m_renderingParent->renderer()) { 76 if (element && m_renderingParent->renderer()) {
67 // FIXME: Guarding this by m_renderingParent->renderer() isn't quite rig ht as the spec for 77 // FIXME: Guarding this by m_renderingParent->renderer() isn't quite rig ht as the spec for
68 // top layer only talks about display: none ancestors so putting a <dial og> inside an 78 // top layer only talks about display: none ancestors so putting a <dial og> inside an
69 // <optgroup> seems like it should still work even though this check wil l prevent it. 79 // <optgroup> seems like it should still work even though this check wil l prevent it.
70 if (element->isInTopLayer()) 80 if (element->isInTopLayer())
71 return m_node->document().renderView(); 81 return m_node->document().renderView();
72 } 82 }
73 83
74 return m_renderingParent->renderer(); 84 return m_renderingParent->renderer();
75 } 85 }
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); 178 newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
169 179
170 RenderObject* nextRenderer = this->nextRenderer(); 180 RenderObject* nextRenderer = this->nextRenderer();
171 textNode->setRenderer(newRenderer); 181 textNode->setRenderer(newRenderer);
172 // Parent takes care of the animations, no need to call setAnimatableStyle. 182 // Parent takes care of the animations, no need to call setAnimatableStyle.
173 newRenderer->setStyle(m_style.release()); 183 newRenderer->setStyle(m_style.release());
174 parentRenderer->addChild(newRenderer, nextRenderer); 184 parentRenderer->addChild(newRenderer, nextRenderer);
175 } 185 }
176 186
177 } 187 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698