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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
265 RenderObject* parentRenderer = this->parentRenderer(); | 265 RenderObject* parentRenderer = this->parentRenderer(); |
266 | 266 |
267 if (m_parentDetails.resetStyleInheritance()) | 267 if (m_parentDetails.resetStyleInheritance()) |
268 m_style = textNode->document()->styleResolver()->defaultStyleForElement(
); | 268 m_style = textNode->document()->styleResolver()->defaultStyleForElement(
); |
269 else | 269 else |
270 m_style = parentRenderer->style(); | 270 m_style = parentRenderer->style(); |
271 | 271 |
272 if (!textNode->textRendererIsNeeded(*this)) | 272 if (!textNode->textRendererIsNeeded(*this)) |
273 return; | 273 return; |
274 | 274 |
275 RenderText* newRenderer = textNode->createTextRenderer(m_style.get()); | 275 RenderText* newRenderer = textNode->createTextRenderer(m_renderingParent, m_
style.get()); |
276 if (!parentRenderer->isChildAllowed(newRenderer, m_style.get())) { | 276 if (!parentRenderer->isChildAllowed(newRenderer, m_style.get())) { |
277 newRenderer->destroy(); | 277 newRenderer->destroy(); |
278 return; | 278 return; |
279 } | 279 } |
280 | 280 |
281 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style | 281 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style |
282 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. | 282 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. |
283 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 283 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
284 | 284 |
285 RenderObject* nextRenderer = this->nextRenderer(); | 285 RenderObject* nextRenderer = this->nextRenderer(); |
286 textNode->setRenderer(newRenderer); | 286 textNode->setRenderer(newRenderer); |
287 // Parent takes care of the animations, no need to call setAnimatableStyle. | 287 // Parent takes care of the animations, no need to call setAnimatableStyle. |
288 newRenderer->setStyle(m_style.release()); | 288 newRenderer->setStyle(m_style.release()); |
289 parentRenderer->addChild(newRenderer, nextRenderer); | 289 parentRenderer->addChild(newRenderer, nextRenderer); |
290 } | 290 } |
291 | 291 |
292 } | 292 } |
OLD | NEW |