| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 } | 128 } |
| 129 | 129 |
| 130 // Make sure the LayoutObject already knows it is going to be added to a Lay
outFlowThread before we set the style | 130 // Make sure the LayoutObject already knows it is going to be added to a Lay
outFlowThread before we set the style |
| 131 // for the first time. Otherwise code using inLayoutFlowThread() in the styl
eWillChange and styleDidChange will fail. | 131 // for the first time. Otherwise code using inLayoutFlowThread() in the styl
eWillChange and styleDidChange will fail. |
| 132 newLayoutObject->setIsInsideFlowThread(parentLayoutObject->isInsideFlowThrea
d()); | 132 newLayoutObject->setIsInsideFlowThread(parentLayoutObject->isInsideFlowThrea
d()); |
| 133 | 133 |
| 134 LayoutObject* nextLayoutObject = this->nextLayoutObject(); | 134 LayoutObject* nextLayoutObject = this->nextLayoutObject(); |
| 135 m_node->setLayoutObject(newLayoutObject); | 135 m_node->setLayoutObject(newLayoutObject); |
| 136 newLayoutObject->setStyle(&style); // setStyle() can depend on layoutObject(
) already being set. | 136 newLayoutObject->setStyle(&style); // setStyle() can depend on layoutObject(
) already being set. |
| 137 | 137 |
| 138 if (Fullscreen::isActiveFullScreenElement(*m_node)) { | 138 if (Fullscreen::isCurrentFullScreenElement(*m_node)) { |
| 139 newLayoutObject = LayoutFullScreen::wrapLayoutObject(newLayoutObject, pa
rentLayoutObject, &m_node->document()); | 139 newLayoutObject = LayoutFullScreen::wrapLayoutObject(newLayoutObject, pa
rentLayoutObject, &m_node->document()); |
| 140 if (!newLayoutObject) | 140 if (!newLayoutObject) |
| 141 return; | 141 return; |
| 142 } | 142 } |
| 143 | 143 |
| 144 // Note: Adding newLayoutObject instead of layoutObject(). layoutObject() ma
y be a child of newLayoutObject. | 144 // Note: Adding newLayoutObject instead of layoutObject(). layoutObject() ma
y be a child of newLayoutObject. |
| 145 parentLayoutObject->addChild(newLayoutObject, nextLayoutObject); | 145 parentLayoutObject->addChild(newLayoutObject, nextLayoutObject); |
| 146 } | 146 } |
| 147 | 147 |
| 148 void LayoutTreeBuilderForText::createLayoutObject() | 148 void LayoutTreeBuilderForText::createLayoutObject() |
| (...skipping 13 matching lines...) Expand all Loading... |
| 162 newLayoutObject->setIsInsideFlowThread(m_layoutObjectParent->isInsideFlowThr
ead()); | 162 newLayoutObject->setIsInsideFlowThread(m_layoutObjectParent->isInsideFlowThr
ead()); |
| 163 | 163 |
| 164 LayoutObject* nextLayoutObject = this->nextLayoutObject(); | 164 LayoutObject* nextLayoutObject = this->nextLayoutObject(); |
| 165 m_node->setLayoutObject(newLayoutObject); | 165 m_node->setLayoutObject(newLayoutObject); |
| 166 // Parent takes care of the animations, no need to call setAnimatableStyle. | 166 // Parent takes care of the animations, no need to call setAnimatableStyle. |
| 167 newLayoutObject->setStyle(&style); | 167 newLayoutObject->setStyle(&style); |
| 168 m_layoutObjectParent->addChild(newLayoutObject, nextLayoutObject); | 168 m_layoutObjectParent->addChild(newLayoutObject, nextLayoutObject); |
| 169 } | 169 } |
| 170 | 170 |
| 171 } // namespace blink | 171 } // namespace blink |
| OLD | NEW |