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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 } | 241 } |
242 | 242 |
243 void NodeRenderingContext::createRendererForElementIfNeeded() | 243 void NodeRenderingContext::createRendererForElementIfNeeded() |
244 { | 244 { |
245 ASSERT(!m_node->renderer()); | 245 ASSERT(!m_node->renderer()); |
246 | 246 |
247 Element* element = toElement(m_node); | 247 Element* element = toElement(m_node); |
248 | 248 |
249 if (!shouldCreateRenderer()) | 249 if (!shouldCreateRenderer()) |
250 return; | 250 return; |
251 m_style = element->styleForRenderer(); | 251 if (!m_style) |
| 252 m_style = element->styleForRenderer(); |
252 ASSERT(m_style); | 253 ASSERT(m_style); |
253 | 254 |
254 moveToFlowThreadIfNeeded(); | 255 moveToFlowThreadIfNeeded(); |
255 | 256 |
256 if (!element->rendererIsNeeded(*this)) | 257 if (!element->rendererIsNeeded(*this)) |
257 return; | 258 return; |
258 | 259 |
259 RenderObject* parentRenderer = this->parentRenderer(); | 260 RenderObject* parentRenderer = this->parentRenderer(); |
260 RenderObject* nextRenderer = this->nextRenderer(); | 261 RenderObject* nextRenderer = this->nextRenderer(); |
261 | 262 |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 320 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
320 | 321 |
321 RenderObject* nextRenderer = this->nextRenderer(); | 322 RenderObject* nextRenderer = this->nextRenderer(); |
322 textNode->setRenderer(newRenderer); | 323 textNode->setRenderer(newRenderer); |
323 // Parent takes care of the animations, no need to call setAnimatableStyle. | 324 // Parent takes care of the animations, no need to call setAnimatableStyle. |
324 newRenderer->setStyle(m_style.release()); | 325 newRenderer->setStyle(m_style.release()); |
325 parentRenderer->addChild(newRenderer, nextRenderer); | 326 parentRenderer->addChild(newRenderer, nextRenderer); |
326 } | 327 } |
327 | 328 |
328 } | 329 } |
OLD | NEW |