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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
183 RenderObject* parentRenderer = this->parentRenderer(); | 183 RenderObject* parentRenderer = this->parentRenderer(); |
184 if (!parentRenderer) | 184 if (!parentRenderer) |
185 return false; | 185 return false; |
186 if (!parentRenderer->canHaveChildren()) | 186 if (!parentRenderer->canHaveChildren()) |
187 return false; | 187 return false; |
188 if (!m_renderingParent->childShouldCreateRenderer(*this)) | 188 if (!m_renderingParent->childShouldCreateRenderer(*this)) |
189 return false; | 189 return false; |
190 return true; | 190 return true; |
191 } | 191 } |
192 | 192 |
193 bool NodeRenderingContext::shouldMoveToFlowThread() const | |
194 { | |
195 ASSERT(m_node->isElementNode()); | |
196 Element* element = toElement(m_node); | |
197 | |
198 Document* doc = m_node->document(); | |
199 | |
200 if (!RuntimeEnabledFeatures::cssRegionsEnabled()) | |
201 return false; | |
202 | |
203 if (doc->webkitIsFullScreen() && doc->webkitCurrentFullScreenElement() == m_ node) | |
204 return false; | |
205 | |
206 if (m_node->isInShadowTree()) | |
207 return false; | |
208 | |
209 // As per http://dev.w3.org/csswg/css3-regions/#flow-into, pseudo-elements s uch as ::first-line, ::first-letter, ::before or ::after | |
210 // cannot be directly collected into a named flow. | |
211 if (m_node->isPseudoElement()) | |
212 return false; | |
213 | |
214 // Allow only svg root elements to be directly collected by a render flow th read. | |
215 if (m_node->isSVGElement() | |
216 && (!(m_node->hasTagName(SVGNames::svgTag) && m_node->parentNode() && !m _node->parentNode()->isSVGElement()))) | |
217 return false; | |
218 | |
219 if (!m_style) | |
220 m_style = element->styleForRenderer(); | |
221 if (!m_style) | |
222 return false; | |
223 | |
224 if (m_style->flowThread().isEmpty()) | |
225 return false; | |
226 | |
227 if (doc->renderView()->flowThreadController()->isContentNodeRegisteredWithAn yNamedFlow(m_node)) | |
228 return false; | |
229 | |
230 return true; | |
231 } | |
232 | |
193 void NodeRenderingContext::moveToFlowThreadIfNeeded() | 233 void NodeRenderingContext::moveToFlowThreadIfNeeded() |
194 { | 234 { |
195 ASSERT(m_node->isElementNode()); | 235 if (!shouldMoveToFlowThread()) |
196 ASSERT(m_style); | |
197 if (!RuntimeEnabledFeatures::cssRegionsEnabled()) | |
198 return; | 236 return; |
199 | 237 |
200 if (m_style->flowThread().isEmpty()) | 238 moveToFlowThread(); |
201 return; | 239 } |
202 | 240 |
203 // As per http://dev.w3.org/csswg/css3-regions/#flow-into, pseudo-elements s uch as ::first-line, ::first-letter, ::before or ::after | 241 void NodeRenderingContext::moveToFlowThread() |
204 // cannot be directly collected into a named flow. | 242 { |
205 if (m_node->isPseudoElement()) | 243 ASSERT(m_node->isElementNode()); |
206 return; | 244 ASSERT(shouldMoveToFlowThread()); |
207 | 245 |
208 // FIXME: Do not collect elements if they are in shadow tree. | 246 if (!m_style) |
209 if (m_node->isInShadowTree()) | 247 m_style = toElement(m_node)->styleForRenderer(); |
210 return; | 248 ASSERT(m_style); |
211 | |
212 Document* document = m_node->document(); | |
213 if (document->webkitIsFullScreen() && document->webkitCurrentFullScreenEleme nt() == m_node) | |
214 return; | |
215 | |
216 #if ENABLE(SVG) | |
217 // Allow only svg root elements to be directly collected by a render flow th read. | |
218 if (m_node->isSVGElement() | |
219 && (!(m_node->hasTagName(SVGNames::svgTag) && m_node->parentNode() && !m _node->parentNode()->isSVGElement()))) | |
220 return; | |
221 #endif | |
222 | |
223 m_flowThread = m_style->flowThread(); | |
224 ASSERT(m_node->document()->renderView()); | 249 ASSERT(m_node->document()->renderView()); |
225 FlowThreadController* flowThreadController = m_node->document()->renderView( )->flowThreadController(); | 250 FlowThreadController* flowThreadController = m_node->document()->renderView( )->flowThreadController(); |
226 m_parentFlowRenderer = flowThreadController->ensureRenderFlowThreadWithName( m_flowThread); | 251 m_parentFlowRenderer = flowThreadController->ensureRenderFlowThreadWithName( m_style->flowThread()); |
227 flowThreadController->registerNamedFlowContentNode(m_node, m_parentFlowRende rer); | 252 flowThreadController->registerNamedFlowContentNode(m_node, m_parentFlowRende rer); |
228 } | 253 } |
229 | 254 |
230 bool NodeRenderingContext::isOnEncapsulationBoundary() const | 255 bool NodeRenderingContext::isOnEncapsulationBoundary() const |
231 { | 256 { |
232 return isOnUpperEncapsulationBoundary() || isLowerEncapsulationBoundary(m_pa rentDetails.insertionPoint()) || isLowerEncapsulationBoundary(m_node->parentNode ()); | 257 return isOnUpperEncapsulationBoundary() || isLowerEncapsulationBoundary(m_pa rentDetails.insertionPoint()) || isLowerEncapsulationBoundary(m_node->parentNode ()); |
233 } | 258 } |
234 | 259 |
235 bool NodeRenderingContext::isOnUpperEncapsulationBoundary() const | 260 bool NodeRenderingContext::isOnUpperEncapsulationBoundary() const |
236 { | 261 { |
237 return m_node->parentNode() && m_node->parentNode()->isShadowRoot(); | 262 return m_node->parentNode() && m_node->parentNode()->isShadowRoot(); |
238 } | 263 } |
239 | 264 |
240 void NodeRenderingContext::createRendererForElementIfNeeded() | 265 void NodeRenderingContext::createRendererForElementIfNeeded() |
241 { | 266 { |
242 ASSERT(!m_node->renderer()); | 267 ASSERT(!m_node->renderer()); |
243 | 268 |
244 Element* element = toElement(m_node); | 269 Element* element = toElement(m_node); |
245 | 270 |
271 bool haveTestedForMoveToFlowThread = false; | |
272 for (const Element* parent = m_node->parentElement(); parent; parent = paren t->parentElement()) | |
Julien - ping for review
2013/05/29 16:47:20
That is wrong. You shouldn't need to walk to the r
Mihai Maerean
2013/06/06 11:45:45
Makes sense what you say, but i've tested the idea
| |
273 if (parent->renderer() && !parent->renderer()->canHaveChildren()) { // T his search avoids doing a style resolution for all nodes. | |
Julien - ping for review
2013/05/29 16:47:20
I think you misunderstood the intent of my comment
Mihai Maerean
2013/06/06 11:45:45
The following code (that also fixes the bug) is in
| |
274 moveToFlowThreadIfNeeded(); | |
275 haveTestedForMoveToFlowThread = true; | |
276 } | |
277 | |
246 if (!shouldCreateRenderer()) | 278 if (!shouldCreateRenderer()) |
247 return; | 279 return; |
248 m_style = element->styleForRenderer(); | 280 if (!m_style) |
281 m_style = element->styleForRenderer(); | |
249 ASSERT(m_style); | 282 ASSERT(m_style); |
250 | 283 |
251 moveToFlowThreadIfNeeded(); | 284 if (!haveTestedForMoveToFlowThread) |
Julien - ping for review
2013/05/29 16:47:20
I have a hard time understanding why we need anoth
Mihai Maerean
2013/06/06 11:45:45
The 1st call to moveToFlowThreadIfNeeded is specif
| |
285 moveToFlowThreadIfNeeded(); | |
252 | 286 |
253 if (!element->rendererIsNeeded(*this)) | 287 if (!element->rendererIsNeeded(*this)) |
254 return; | 288 return; |
255 | 289 |
256 RenderObject* parentRenderer = this->parentRenderer(); | 290 RenderObject* parentRenderer = this->parentRenderer(); |
257 RenderObject* nextRenderer = this->nextRenderer(); | 291 RenderObject* nextRenderer = this->nextRenderer(); |
258 | 292 |
259 Document* document = element->document(); | 293 Document* document = element->document(); |
260 RenderObject* newRenderer = element->createRenderer(document->renderArena(), m_style.get()); | 294 RenderObject* newRenderer = element->createRenderer(document->renderArena(), m_style.get()); |
261 if (!newRenderer) | 295 if (!newRenderer) |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
315 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 349 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
316 | 350 |
317 RenderObject* nextRenderer = this->nextRenderer(); | 351 RenderObject* nextRenderer = this->nextRenderer(); |
318 textNode->setRenderer(newRenderer); | 352 textNode->setRenderer(newRenderer); |
319 // Parent takes care of the animations, no need to call setAnimatableStyle. | 353 // Parent takes care of the animations, no need to call setAnimatableStyle. |
320 newRenderer->setStyle(m_style.release()); | 354 newRenderer->setStyle(m_style.release()); |
321 parentRenderer->addChild(newRenderer, nextRenderer); | 355 parentRenderer->addChild(newRenderer, nextRenderer); |
322 } | 356 } |
323 | 357 |
324 } | 358 } |
OLD | NEW |