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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 { | 97 { |
98 if (!m_style) | 98 if (!m_style) |
99 m_style = toElement(m_node)->styleForRenderer(); | 99 m_style = toElement(m_node)->styleForRenderer(); |
100 return *m_style; | 100 return *m_style; |
101 } | 101 } |
102 | 102 |
103 void RenderTreeBuilder::createRendererForElementIfNeeded() | 103 void RenderTreeBuilder::createRendererForElementIfNeeded() |
104 { | 104 { |
105 ASSERT(!m_node->renderer()); | 105 ASSERT(!m_node->renderer()); |
106 | 106 |
107 // If we're out of composition then we can't render since there's no parent
to inherit from. | |
108 if (!m_renderingParent) | |
109 return; | |
110 | |
111 Element* element = toElement(m_node); | |
112 | |
113 if (!shouldCreateRenderer()) | 107 if (!shouldCreateRenderer()) |
114 return; | 108 return; |
115 | 109 |
| 110 Element* element = toElement(m_node); |
116 RenderStyle& style = this->style(); | 111 RenderStyle& style = this->style(); |
117 | 112 |
118 if (!element->rendererIsNeeded(style)) | 113 if (!element->rendererIsNeeded(style)) |
119 return; | 114 return; |
120 | 115 |
121 RenderObject* newRenderer = element->createRenderer(&style); | 116 RenderObject* newRenderer = element->createRenderer(&style); |
122 if (!newRenderer) | 117 if (!newRenderer) |
123 return; | 118 return; |
124 | 119 |
125 RenderObject* parentRenderer = this->parentRenderer(); | 120 RenderObject* parentRenderer = this->parentRenderer(); |
(...skipping 18 matching lines...) Expand all Loading... |
144 } | 139 } |
145 | 140 |
146 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. | 141 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. |
147 parentRenderer->addChild(newRenderer, nextRenderer); | 142 parentRenderer->addChild(newRenderer, nextRenderer); |
148 } | 143 } |
149 | 144 |
150 void RenderTreeBuilder::createRendererForTextIfNeeded() | 145 void RenderTreeBuilder::createRendererForTextIfNeeded() |
151 { | 146 { |
152 ASSERT(!m_node->renderer()); | 147 ASSERT(!m_node->renderer()); |
153 | 148 |
154 // If we're out of composition then we can't render since there's no parent
to inherit from. | |
155 if (!m_renderingParent) | |
156 return; | |
157 | |
158 if (!shouldCreateRenderer()) | 149 if (!shouldCreateRenderer()) |
159 return; | 150 return; |
160 | 151 |
161 Text* textNode = toText(m_node); | 152 Text* textNode = toText(m_node); |
162 RenderObject* parentRenderer = this->parentRenderer(); | 153 RenderObject* parentRenderer = this->parentRenderer(); |
163 | 154 |
164 m_style = parentRenderer->style(); | 155 m_style = parentRenderer->style(); |
165 | 156 |
166 if (!textNode->textRendererIsNeeded(*m_style, *parentRenderer)) | 157 if (!textNode->textRendererIsNeeded(*m_style, *parentRenderer)) |
167 return; | 158 return; |
168 | 159 |
169 RenderText* newRenderer = textNode->createTextRenderer(m_style.get()); | 160 RenderText* newRenderer = textNode->createTextRenderer(m_style.get()); |
170 if (!parentRenderer->isChildAllowed(newRenderer, m_style.get())) { | 161 if (!parentRenderer->isChildAllowed(newRenderer, m_style.get())) { |
171 newRenderer->destroy(); | 162 newRenderer->destroy(); |
172 return; | 163 return; |
173 } | 164 } |
174 | 165 |
175 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style | 166 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style |
176 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. | 167 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. |
177 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 168 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
178 | 169 |
179 RenderObject* nextRenderer = this->nextRenderer(); | 170 RenderObject* nextRenderer = this->nextRenderer(); |
180 textNode->setRenderer(newRenderer); | 171 textNode->setRenderer(newRenderer); |
181 // Parent takes care of the animations, no need to call setAnimatableStyle. | 172 // Parent takes care of the animations, no need to call setAnimatableStyle. |
182 newRenderer->setStyle(m_style.release()); | 173 newRenderer->setStyle(m_style.release()); |
183 parentRenderer->addChild(newRenderer, nextRenderer); | 174 parentRenderer->addChild(newRenderer, nextRenderer); |
184 } | 175 } |
185 | 176 |
186 } | 177 } |
OLD | NEW |