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 13 matching lines...) Expand all Loading... |
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/FirstLetterPseudoElement.h" |
33 #include "core/dom/Fullscreen.h" | 33 #include "core/dom/Fullscreen.h" |
| 34 #include "core/dom/MarkerPseudoElement.h" |
34 #include "core/dom/Node.h" | 35 #include "core/dom/Node.h" |
35 #include "core/dom/PseudoElement.h" | 36 #include "core/dom/PseudoElement.h" |
36 #include "core/dom/Text.h" | 37 #include "core/dom/Text.h" |
37 #include "core/rendering/RenderFullScreen.h" | 38 #include "core/rendering/RenderFullScreen.h" |
38 #include "core/rendering/RenderObject.h" | 39 #include "core/rendering/RenderObject.h" |
39 #include "core/rendering/RenderText.h" | 40 #include "core/rendering/RenderText.h" |
40 #include "core/rendering/RenderView.h" | 41 #include "core/rendering/RenderView.h" |
41 #include "core/svg/SVGElement.h" | 42 #include "core/svg/SVGElement.h" |
42 #include "platform/RuntimeEnabledFeatures.h" | 43 #include "platform/RuntimeEnabledFeatures.h" |
43 | 44 |
44 namespace blink { | 45 namespace blink { |
45 | 46 |
46 RenderTreeBuilderForElement::RenderTreeBuilderForElement(Element& element, Rende
rStyle* style) | 47 RenderTreeBuilderForElement::RenderTreeBuilderForElement(Element& element, Rende
rStyle* style) |
47 : RenderTreeBuilder(element, nullptr) | 48 : RenderTreeBuilder(element, nullptr) |
48 , m_style(style) | 49 , m_style(style) |
49 { | 50 { |
50 if (element.isFirstLetterPseudoElement()) { | 51 if (element.isFirstLetterPseudoElement()) { |
51 if (RenderObject* nextRenderer = FirstLetterPseudoElement::firstLetterTe
xtRenderer(element)) | 52 if (RenderObject* nextRenderer = FirstLetterPseudoElement::firstLetterTe
xtRenderer(element)) |
52 m_renderingParent = nextRenderer->parent(); | 53 m_renderingParent = nextRenderer->parent(); |
53 } else if (ContainerNode* containerNode = NodeRenderingTraversal::parent(ele
ment)) { | 54 } else if (ContainerNode* containerNode = NodeRenderingTraversal::parent(ele
ment)) { |
54 m_renderingParent = containerNode->renderer(); | 55 m_renderingParent = containerNode->renderer(); |
55 } | 56 } |
56 } | 57 } |
57 | 58 |
58 RenderObject* RenderTreeBuilderForElement::nextRenderer() const | 59 RenderObject* RenderTreeBuilderForElement::nextRenderer(RenderObject* parentRend
erer) const |
59 { | 60 { |
60 ASSERT(m_renderingParent); | 61 ASSERT(m_renderingParent); |
61 | 62 |
62 if (m_node->isInTopLayer()) | 63 if (m_node->isInTopLayer()) |
63 return NodeRenderingTraversal::nextInTopLayer(*m_node); | 64 return NodeRenderingTraversal::nextInTopLayer(*m_node); |
64 | 65 |
65 if (m_node->isFirstLetterPseudoElement()) | 66 if (m_node->isFirstLetterPseudoElement()) |
66 return FirstLetterPseudoElement::firstLetterTextRenderer(*m_node); | 67 return FirstLetterPseudoElement::firstLetterTextRenderer(*m_node); |
67 | 68 |
| 69 if (m_node->isMarkerPseudoElement()) { |
| 70 ASSERT(parentRenderer); |
| 71 return MarkerPseudoElement::firstNonMarkerChild(parentRenderer); |
| 72 } |
| 73 |
68 return RenderTreeBuilder::nextRenderer(); | 74 return RenderTreeBuilder::nextRenderer(); |
69 } | 75 } |
70 | 76 |
71 RenderObject* RenderTreeBuilderForElement::parentRenderer() const | 77 RenderObject* RenderTreeBuilderForElement::parentRenderer() const |
72 { | 78 { |
73 RenderObject* parentRenderer = RenderTreeBuilder::parentRenderer(); | 79 RenderObject* parentRenderer = RenderTreeBuilder::parentRenderer(); |
74 | 80 |
| 81 if (m_node->isMarkerPseudoElement()) { |
| 82 ASSERT(m_renderingParent->isRenderBlockFlow()); |
| 83 if (RenderObject* markerRenderer = MarkerPseudoElement::getParentOfFirst
LineBox(toRenderBlockFlow(m_renderingParent), nullptr)) |
| 84 return markerRenderer; |
| 85 } |
| 86 |
75 if (parentRenderer) { | 87 if (parentRenderer) { |
76 // FIXME: Guarding this by parentRenderer isn't quite right as the spec
for | 88 // FIXME: Guarding this by parentRenderer isn't quite right as the spec
for |
77 // top layer only talks about display: none ancestors so putting a <dial
og> inside an | 89 // top layer only talks about display: none ancestors so putting a <dial
og> inside an |
78 // <optgroup> seems like it should still work even though this check wil
l prevent it. | 90 // <optgroup> seems like it should still work even though this check wil
l prevent it. |
79 if (m_node->isInTopLayer()) | 91 if (m_node->isInTopLayer()) |
80 return m_node->document().renderView(); | 92 return m_node->document().renderView(); |
81 } | 93 } |
82 | 94 |
83 return parentRenderer; | 95 return parentRenderer; |
84 } | 96 } |
(...skipping 11 matching lines...) Expand all Loading... |
96 if (!toSVGElement(m_node)->isValid()) | 108 if (!toSVGElement(m_node)->isValid()) |
97 return false; | 109 return false; |
98 } | 110 } |
99 | 111 |
100 RenderObject* parentRenderer = this->parentRenderer(); | 112 RenderObject* parentRenderer = this->parentRenderer(); |
101 if (!parentRenderer) | 113 if (!parentRenderer) |
102 return false; | 114 return false; |
103 if (!parentRenderer->canHaveChildren()) | 115 if (!parentRenderer->canHaveChildren()) |
104 return false; | 116 return false; |
105 | 117 |
| 118 if (m_node->isMarkerPseudoElement() && m_renderingParent->style()->display()
== LIST_ITEM) |
| 119 return true; |
| 120 |
106 return m_node->rendererIsNeeded(style()); | 121 return m_node->rendererIsNeeded(style()); |
107 } | 122 } |
108 | 123 |
109 RenderStyle& RenderTreeBuilderForElement::style() const | 124 RenderStyle& RenderTreeBuilderForElement::style() const |
110 { | 125 { |
111 if (!m_style) | 126 if (!m_style) |
112 m_style = m_node->styleForRenderer(); | 127 m_style = m_node->styleForRenderer(); |
113 return *m_style; | 128 return *m_style; |
114 } | 129 } |
115 | 130 |
116 void RenderTreeBuilderForElement::createRenderer() | 131 void RenderTreeBuilderForElement::createRenderer() |
117 { | 132 { |
118 RenderStyle& style = this->style(); | 133 RenderStyle& style = this->style(); |
119 | 134 |
120 RenderObject* newRenderer = m_node->createRenderer(&style); | 135 RenderObject* newRenderer = m_node->createRenderer(&style); |
121 if (!newRenderer) | 136 if (!newRenderer) |
122 return; | 137 return; |
123 | 138 |
124 RenderObject* parentRenderer = this->parentRenderer(); | 139 RenderObject* parentRenderer = this->parentRenderer(); |
125 | 140 |
126 if (!parentRenderer->isChildAllowed(newRenderer, &style)) { | 141 if (!parentRenderer->isChildAllowed(newRenderer, &style)) { |
127 newRenderer->destroy(); | 142 newRenderer->destroy(); |
128 return; | 143 return; |
129 } | 144 } |
130 | 145 |
131 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style | 146 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style |
132 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. | 147 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. |
133 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 148 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
134 | 149 |
135 RenderObject* nextRenderer = this->nextRenderer(); | 150 RenderObject* nextRenderer = this->nextRenderer(parentRenderer); |
136 m_node->setRenderer(newRenderer); | 151 m_node->setRenderer(newRenderer); |
137 newRenderer->setStyle(&style); // setStyle() can depend on renderer() alread
y being set. | 152 newRenderer->setStyle(&style); // setStyle() can depend on renderer() alread
y being set. |
138 | 153 |
139 if (Fullscreen::isActiveFullScreenElement(*m_node)) { | 154 if (Fullscreen::isActiveFullScreenElement(*m_node)) { |
140 newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer
, &m_node->document()); | 155 newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer
, &m_node->document()); |
141 if (!newRenderer) | 156 if (!newRenderer) |
142 return; | 157 return; |
143 } | 158 } |
144 | 159 |
145 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. | 160 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. |
(...skipping 18 matching lines...) Expand all Loading... |
164 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 179 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
165 | 180 |
166 RenderObject* nextRenderer = this->nextRenderer(); | 181 RenderObject* nextRenderer = this->nextRenderer(); |
167 m_node->setRenderer(newRenderer); | 182 m_node->setRenderer(newRenderer); |
168 // Parent takes care of the animations, no need to call setAnimatableStyle. | 183 // Parent takes care of the animations, no need to call setAnimatableStyle. |
169 newRenderer->setStyle(style); | 184 newRenderer->setStyle(style); |
170 parentRenderer->addChild(newRenderer, nextRenderer); | 185 parentRenderer->addChild(newRenderer, nextRenderer); |
171 } | 186 } |
172 | 187 |
173 } | 188 } |
OLD | NEW |