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