| 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 16 matching lines...) Expand all Loading... |
| 27 #include "core/dom/NodeRenderingContext.h" | 27 #include "core/dom/NodeRenderingContext.h" |
| 28 | 28 |
| 29 #include "SVGNames.h" | 29 #include "SVGNames.h" |
| 30 #include "core/css/resolver/StyleResolver.h" | 30 #include "core/css/resolver/StyleResolver.h" |
| 31 #include "core/dom/ContainerNode.h" | 31 #include "core/dom/ContainerNode.h" |
| 32 #include "core/dom/FullscreenController.h" | 32 #include "core/dom/FullscreenController.h" |
| 33 #include "core/dom/Node.h" | 33 #include "core/dom/Node.h" |
| 34 #include "core/dom/Text.h" | 34 #include "core/dom/Text.h" |
| 35 #include "core/html/shadow/HTMLShadowElement.h" | 35 #include "core/html/shadow/HTMLShadowElement.h" |
| 36 #include "core/rendering/FlowThreadController.h" | 36 #include "core/rendering/FlowThreadController.h" |
| 37 #include "core/rendering/RenderFullScreen.h" | |
| 38 #include "core/rendering/RenderNamedFlowThread.h" | 37 #include "core/rendering/RenderNamedFlowThread.h" |
| 39 #include "core/rendering/RenderObject.h" | 38 #include "core/rendering/RenderObject.h" |
| 40 #include "core/rendering/RenderText.h" | 39 #include "core/rendering/RenderText.h" |
| 41 #include "core/rendering/RenderView.h" | 40 #include "core/rendering/RenderView.h" |
| 42 | 41 |
| 43 namespace WebCore { | 42 namespace WebCore { |
| 44 | 43 |
| 45 NodeRenderingContext::NodeRenderingContext(Node* node) | 44 NodeRenderingContext::NodeRenderingContext(Node* node) |
| 46 : m_node(node) | 45 : m_node(node) |
| 47 , m_parentFlowRenderer(0) | 46 , m_parentFlowRenderer(0) |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 return; | 265 return; |
| 267 } | 266 } |
| 268 | 267 |
| 269 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style | 268 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style |
| 270 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. | 269 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. |
| 271 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 270 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
| 272 | 271 |
| 273 element->setRenderer(newRenderer); | 272 element->setRenderer(newRenderer); |
| 274 newRenderer->setAnimatableStyle(m_style.release()); // setAnimatableStyle()
can depend on renderer() already being set. | 273 newRenderer->setAnimatableStyle(m_style.release()); // setAnimatableStyle()
can depend on renderer() already being set. |
| 275 | 274 |
| 276 if (FullscreenController::isActiveFullScreenElement(element)) { | |
| 277 newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer
, document); | |
| 278 if (!newRenderer) | |
| 279 return; | |
| 280 } | |
| 281 | |
| 282 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. | 275 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. |
| 283 parentRenderer->addChild(newRenderer, nextRenderer); | 276 parentRenderer->addChild(newRenderer, nextRenderer); |
| 284 } | 277 } |
| 285 | 278 |
| 286 void NodeRenderingContext::createRendererForTextIfNeeded() | 279 void NodeRenderingContext::createRendererForTextIfNeeded() |
| 287 { | 280 { |
| 288 ASSERT(!m_node->renderer()); | 281 ASSERT(!m_node->renderer()); |
| 289 | 282 |
| 290 Text* textNode = toText(m_node); | 283 Text* textNode = toText(m_node); |
| 291 | 284 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 316 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 309 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
| 317 | 310 |
| 318 RenderObject* nextRenderer = this->nextRenderer(); | 311 RenderObject* nextRenderer = this->nextRenderer(); |
| 319 textNode->setRenderer(newRenderer); | 312 textNode->setRenderer(newRenderer); |
| 320 // Parent takes care of the animations, no need to call setAnimatableStyle. | 313 // Parent takes care of the animations, no need to call setAnimatableStyle. |
| 321 newRenderer->setStyle(m_style.release()); | 314 newRenderer->setStyle(m_style.release()); |
| 322 parentRenderer->addChild(newRenderer, nextRenderer); | 315 parentRenderer->addChild(newRenderer, nextRenderer); |
| 323 } | 316 } |
| 324 | 317 |
| 325 } | 318 } |
| OLD | NEW |