| 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 newRenderer->destroy(); | 223 newRenderer->destroy(); |
| 224 return; | 224 return; |
| 225 } | 225 } |
| 226 | 226 |
| 227 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style | 227 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style |
| 228 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. | 228 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. |
| 229 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 229 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
| 230 | 230 |
| 231 RenderObject* nextRenderer = this->nextRenderer(); | 231 RenderObject* nextRenderer = this->nextRenderer(); |
| 232 element->setRenderer(newRenderer); | 232 element->setRenderer(newRenderer); |
| 233 newRenderer->setAnimatableStyle(&style); // setAnimatableStyle() can depend
on renderer() already being set. | 233 newRenderer->setStyle(&style); // setStyle() can depend on renderer() alread
y being set. |
| 234 | 234 |
| 235 if (FullscreenElementStack::isActiveFullScreenElement(element)) { | 235 if (FullscreenElementStack::isActiveFullScreenElement(element)) { |
| 236 newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer
, &element->document()); | 236 newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer
, &element->document()); |
| 237 if (!newRenderer) | 237 if (!newRenderer) |
| 238 return; | 238 return; |
| 239 } | 239 } |
| 240 | 240 |
| 241 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. | 241 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. |
| 242 parentRenderer->addChild(newRenderer, nextRenderer); | 242 parentRenderer->addChild(newRenderer, nextRenderer); |
| 243 } | 243 } |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 275 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
| 276 | 276 |
| 277 RenderObject* nextRenderer = this->nextRenderer(); | 277 RenderObject* nextRenderer = this->nextRenderer(); |
| 278 textNode->setRenderer(newRenderer); | 278 textNode->setRenderer(newRenderer); |
| 279 // Parent takes care of the animations, no need to call setAnimatableStyle. | 279 // Parent takes care of the animations, no need to call setAnimatableStyle. |
| 280 newRenderer->setStyle(m_style.release()); | 280 newRenderer->setStyle(m_style.release()); |
| 281 parentRenderer->addChild(newRenderer, nextRenderer); | 281 parentRenderer->addChild(newRenderer, nextRenderer); |
| 282 } | 282 } |
| 283 | 283 |
| 284 } | 284 } |
| OLD | NEW |