| 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 return; | 121 return; |
| 122 | 122 |
| 123 RenderText* newRenderer = textNode->createTextRenderer(m_style.get()); | 123 RenderText* newRenderer = textNode->createTextRenderer(m_style.get()); |
| 124 if (!parentRenderer->isChildAllowed(newRenderer, m_style.get())) { | 124 if (!parentRenderer->isChildAllowed(newRenderer, m_style.get())) { |
| 125 newRenderer->destroy(); | 125 newRenderer->destroy(); |
| 126 return; | 126 return; |
| 127 } | 127 } |
| 128 | 128 |
| 129 RenderObject* nextRenderer = this->nextRenderer(); | 129 RenderObject* nextRenderer = this->nextRenderer(); |
| 130 textNode->setRenderer(newRenderer); | 130 textNode->setRenderer(newRenderer); |
| 131 // Parent takes care of the animations, no need to call setAnimatableStyle. | |
| 132 newRenderer->setStyle(m_style.release()); | 131 newRenderer->setStyle(m_style.release()); |
| 133 parentRenderer->addChild(newRenderer, nextRenderer); | 132 parentRenderer->addChild(newRenderer, nextRenderer); |
| 134 } | 133 } |
| 135 | 134 |
| 136 } | 135 } |
| OLD | NEW |