OLD | NEW |
---|---|
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 Loading... | |
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 |
55 if (element && element->isFirstLetterPseudoElement()) | |
56 return FirstLetterPseudoElement::firstLetterTextRenderer(*element); | |
57 | |
53 // Avoid an O(N^2) walk over the children when reattaching all children of a node. | 58 // Avoid an O(N^2) walk over the children when reattaching all children of a node. |
54 if (m_renderingParent->needsAttach()) | 59 if (m_renderingParent->node() && m_renderingParent->node()->needsAttach()) |
esprehn
2014/10/11 04:46:20
This is not correct.
esprehn
2014/10/11 04:49:34
Sorry, this is correct, it just seems really gross
dsinclair
2014/10/14 14:31:27
Acknowledged.
| |
55 return 0; | 60 return 0; |
56 | 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 |
66 if (element && m_renderingParent->renderer()) { | 71 if (element && m_renderingParent) { |
67 // FIXME: Guarding this by m_renderingParent->renderer() isn't quite rig ht as the spec for | 72 // FIXME: Guarding this by m_renderingParent isn't quite right as the sp ec for |
68 // top layer only talks about display: none ancestors so putting a <dial og> inside an | 73 // 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. | 74 // <optgroup> seems like it should still work even though this check wil l prevent it. |
70 if (element->isInTopLayer()) | 75 if (element->isInTopLayer()) |
71 return m_node->document().renderView(); | 76 return m_node->document().renderView(); |
72 } | 77 } |
73 | 78 |
74 return m_renderingParent->renderer(); | 79 return m_renderingParent; |
75 } | 80 } |
76 | 81 |
77 bool RenderTreeBuilder::shouldCreateRenderer() const | 82 bool RenderTreeBuilder::shouldCreateRenderer() const |
78 { | 83 { |
79 if (!m_renderingParent) | 84 if (!m_renderingParent) |
80 return false; | 85 return false; |
81 if (m_node->isSVGElement()) { | 86 if (m_node->isSVGElement()) { |
82 // SVG elements only render when inside <svg>, or if the element is an < svg> itself. | 87 // SVG elements only render when inside <svg>, or if the element is an < svg> itself. |
83 if (!isSVGSVGElement(*m_node) && !m_renderingParent->isSVGElement()) | 88 if (!isSVGSVGElement(*m_node) && !(m_renderingParent->node() && m_render ingParent->node()->isSVGElement())) |
esprehn
2014/10/11 04:46:20
propagate the ! through it, it's very hard to read
dsinclair
2014/10/14 14:31:27
Done.
| |
84 return false; | 89 return false; |
85 if (!toSVGElement(m_node)->isValid()) | 90 if (!toSVGElement(m_node)->isValid()) |
86 return false; | 91 return false; |
87 } | 92 } |
93 | |
88 RenderObject* parentRenderer = this->parentRenderer(); | 94 RenderObject* parentRenderer = this->parentRenderer(); |
89 if (!parentRenderer) | 95 if (!parentRenderer) |
90 return false; | 96 return false; |
91 if (!parentRenderer->canHaveChildren()) | 97 if (!parentRenderer->canHaveChildren()) |
92 return false; | 98 return false; |
93 return true; | 99 return true; |
94 } | 100 } |
95 | 101 |
96 RenderStyle& RenderTreeBuilder::style() const | 102 RenderStyle& RenderTreeBuilder::style() const |
97 { | 103 { |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
168 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 174 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
169 | 175 |
170 RenderObject* nextRenderer = this->nextRenderer(); | 176 RenderObject* nextRenderer = this->nextRenderer(); |
171 textNode->setRenderer(newRenderer); | 177 textNode->setRenderer(newRenderer); |
172 // Parent takes care of the animations, no need to call setAnimatableStyle. | 178 // Parent takes care of the animations, no need to call setAnimatableStyle. |
173 newRenderer->setStyle(m_style.release()); | 179 newRenderer->setStyle(m_style.release()); |
174 parentRenderer->addChild(newRenderer, nextRenderer); | 180 parentRenderer->addChild(newRenderer, nextRenderer); |
175 } | 181 } |
176 | 182 |
177 } | 183 } |
OLD | NEW |