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

Side by Side Diff: Source/core/dom/RenderTreeBuilder.cpp

Issue 639863006: Revert of Convert first letter into a pseudo element. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/core/dom/RenderTreeBuilder.h ('k') | Source/core/editing/TextIterator.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
33 #include "core/dom/Fullscreen.h" 32 #include "core/dom/Fullscreen.h"
34 #include "core/dom/Node.h" 33 #include "core/dom/Node.h"
35 #include "core/dom/PseudoElement.h"
36 #include "core/dom/Text.h" 34 #include "core/dom/Text.h"
37 #include "core/rendering/RenderFullScreen.h" 35 #include "core/rendering/RenderFullScreen.h"
38 #include "core/rendering/RenderObject.h" 36 #include "core/rendering/RenderObject.h"
39 #include "core/rendering/RenderText.h" 37 #include "core/rendering/RenderText.h"
40 #include "core/rendering/RenderView.h" 38 #include "core/rendering/RenderView.h"
41 #include "core/svg/SVGElement.h" 39 #include "core/svg/SVGElement.h"
42 #include "platform/RuntimeEnabledFeatures.h" 40 #include "platform/RuntimeEnabledFeatures.h"
43 41
44 namespace blink { 42 namespace blink {
45 43
46 RenderTreeBuilder::RenderTreeBuilder(Node* node, RenderStyle* style)
47 : m_node(node)
48 , m_renderingParent(nullptr)
49 , m_style(style)
50 {
51 ASSERT(!node->renderer());
52 ASSERT(node->needsAttach());
53 ASSERT(node->document().inStyleRecalc());
54
55 // FIXME: We should be able to ASSERT(node->inActiveDocument()) but children Changed is called
56 // before ChildNodeInsertionNotifier in ContainerNode's methods and some imp lementations
57 // will trigger a layout inside childrenChanged.
58 // Mainly HTMLTextAreaElement::childrenChanged calls HTMLTextFormControlElem ent::setSelectionRange
59 // which does an updateLayoutIgnorePendingStylesheets.
60
61 Element* element = node->isElementNode() ? toElement(node) : 0;
62 if (element && element->isFirstLetterPseudoElement()) {
63 if (RenderObject* nextRenderer = FirstLetterPseudoElement::firstLetterTe xtRenderer(*element))
64 m_renderingParent = nextRenderer->parent();
65 } else if (ContainerNode* containerNode = NodeRenderingTraversal::parent(nod e, &m_parentDetails)) {
66 m_renderingParent = containerNode->renderer();
67 }
68 }
69
70 RenderObject* RenderTreeBuilder::nextRenderer() const 44 RenderObject* RenderTreeBuilder::nextRenderer() const
71 { 45 {
72 ASSERT(m_renderingParent); 46 ASSERT(m_renderingParent);
73 47
74 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; 48 Element* element = m_node->isElementNode() ? toElement(m_node) : 0;
75 49
76 if (element && element->isInTopLayer()) 50 if (element && element->isInTopLayer())
77 return NodeRenderingTraversal::nextInTopLayer(element); 51 return NodeRenderingTraversal::nextInTopLayer(element);
78 52
79 if (element && element->isFirstLetterPseudoElement())
80 return FirstLetterPseudoElement::firstLetterTextRenderer(*element);
81
82 // Avoid an O(N^2) walk over the children when reattaching all children of a node. 53 // Avoid an O(N^2) walk over the children when reattaching all children of a node.
83 if (m_renderingParent->node() && m_renderingParent->node()->needsAttach()) 54 if (m_renderingParent->needsAttach())
84 return 0; 55 return 0;
85 56
86 return NodeRenderingTraversal::nextSiblingRenderer(m_node); 57 return NodeRenderingTraversal::nextSiblingRenderer(m_node);
87 } 58 }
88 59
89 RenderObject* RenderTreeBuilder::parentRenderer() const 60 RenderObject* RenderTreeBuilder::parentRenderer() const
90 { 61 {
91 ASSERT(m_renderingParent); 62 ASSERT(m_renderingParent);
92 63
93 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; 64 Element* element = m_node->isElementNode() ? toElement(m_node) : 0;
94 65
95 if (element && m_renderingParent) { 66 if (element && m_renderingParent->renderer()) {
96 // FIXME: Guarding this by m_renderingParent isn't quite right as the sp ec for 67 // FIXME: Guarding this by m_renderingParent->renderer() isn't quite rig ht as the spec for
97 // top layer only talks about display: none ancestors so putting a <dial og> inside an 68 // top layer only talks about display: none ancestors so putting a <dial og> inside an
98 // <optgroup> seems like it should still work even though this check wil l prevent it. 69 // <optgroup> seems like it should still work even though this check wil l prevent it.
99 if (element->isInTopLayer()) 70 if (element->isInTopLayer())
100 return m_node->document().renderView(); 71 return m_node->document().renderView();
101 } 72 }
102 73
103 return m_renderingParent; 74 return m_renderingParent->renderer();
104 } 75 }
105 76
106 bool RenderTreeBuilder::shouldCreateRenderer() const 77 bool RenderTreeBuilder::shouldCreateRenderer() const
107 { 78 {
108 if (!m_renderingParent) 79 if (!m_renderingParent)
109 return false; 80 return false;
110 if (m_node->isSVGElement()) { 81 if (m_node->isSVGElement()) {
111 // SVG elements only render when inside <svg>, or if the element is an < svg> itself. 82 // SVG elements only render when inside <svg>, or if the element is an < svg> itself.
112 if (!isSVGSVGElement(*m_node) && (!m_renderingParent->node() || !m_rende ringParent->node()->isSVGElement())) 83 if (!isSVGSVGElement(*m_node) && !m_renderingParent->isSVGElement())
113 return false; 84 return false;
114 if (!toSVGElement(m_node)->isValid()) 85 if (!toSVGElement(m_node)->isValid())
115 return false; 86 return false;
116 } 87 }
117
118 RenderObject* parentRenderer = this->parentRenderer(); 88 RenderObject* parentRenderer = this->parentRenderer();
119 if (!parentRenderer) 89 if (!parentRenderer)
120 return false; 90 return false;
121 if (!parentRenderer->canHaveChildren()) 91 if (!parentRenderer->canHaveChildren())
122 return false; 92 return false;
123 return true; 93 return true;
124 } 94 }
125 95
126 RenderStyle& RenderTreeBuilder::style() const 96 RenderStyle& RenderTreeBuilder::style() const
127 { 97 {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); 168 newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
199 169
200 RenderObject* nextRenderer = this->nextRenderer(); 170 RenderObject* nextRenderer = this->nextRenderer();
201 textNode->setRenderer(newRenderer); 171 textNode->setRenderer(newRenderer);
202 // Parent takes care of the animations, no need to call setAnimatableStyle. 172 // Parent takes care of the animations, no need to call setAnimatableStyle.
203 newRenderer->setStyle(m_style.release()); 173 newRenderer->setStyle(m_style.release());
204 parentRenderer->addChild(newRenderer, nextRenderer); 174 parentRenderer->addChild(newRenderer, nextRenderer);
205 } 175 }
206 176
207 } 177 }
OLDNEW
« no previous file with comments | « Source/core/dom/RenderTreeBuilder.h ('k') | Source/core/editing/TextIterator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698