| 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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 } | 220 } |
| 221 | 221 |
| 222 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style | 222 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style |
| 223 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. | 223 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. |
| 224 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 224 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
| 225 | 225 |
| 226 RenderObject* nextRenderer = this->nextRenderer(); | 226 RenderObject* nextRenderer = this->nextRenderer(); |
| 227 element->setRenderer(newRenderer); | 227 element->setRenderer(newRenderer); |
| 228 newRenderer->setAnimatableStyle(&style); // setAnimatableStyle() can depend
on renderer() already being set. | 228 newRenderer->setAnimatableStyle(&style); // setAnimatableStyle() can depend
on renderer() already being set. |
| 229 | 229 |
| 230 if (FullscreenElementStack::isActiveFullScreenElement(element)) { | |
| 231 newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer
, &element->document()); | |
| 232 if (!newRenderer) | |
| 233 return; | |
| 234 } | |
| 235 | |
| 236 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. | 230 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. |
| 237 parentRenderer->addChild(newRenderer, nextRenderer); | 231 parentRenderer->addChild(newRenderer, nextRenderer); |
| 238 } | 232 } |
| 239 | 233 |
| 240 void RenderTreeBuilder::createRendererForTextIfNeeded() | 234 void RenderTreeBuilder::createRendererForTextIfNeeded() |
| 241 { | 235 { |
| 242 ASSERT(!m_node->renderer()); | 236 ASSERT(!m_node->renderer()); |
| 243 | 237 |
| 244 // If we're out of composition then we can't render since there's no parent
to inherit from. | 238 // If we're out of composition then we can't render since there's no parent
to inherit from. |
| 245 if (!m_renderingParent) | 239 if (!m_renderingParent) |
| (...skipping 24 matching lines...) Expand all Loading... |
| 270 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 264 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
| 271 | 265 |
| 272 RenderObject* nextRenderer = this->nextRenderer(); | 266 RenderObject* nextRenderer = this->nextRenderer(); |
| 273 textNode->setRenderer(newRenderer); | 267 textNode->setRenderer(newRenderer); |
| 274 // Parent takes care of the animations, no need to call setAnimatableStyle. | 268 // Parent takes care of the animations, no need to call setAnimatableStyle. |
| 275 newRenderer->setStyle(m_style.release()); | 269 newRenderer->setStyle(m_style.release()); |
| 276 parentRenderer->addChild(newRenderer, nextRenderer); | 270 parentRenderer->addChild(newRenderer, nextRenderer); |
| 277 } | 271 } |
| 278 | 272 |
| 279 } | 273 } |
| OLD | NEW |