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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 } | 125 } |
126 | 126 |
127 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style | 127 // Make sure the RenderObject already knows it is going to be added to a Ren
derFlowThread before we set the style |
128 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. | 128 // for the first time. Otherwise code using inRenderFlowThread() in the styl
eWillChange and styleDidChange will fail. |
129 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 129 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
130 | 130 |
131 RenderObject* nextRenderer = this->nextRenderer(); | 131 RenderObject* nextRenderer = this->nextRenderer(); |
132 element->setRenderer(newRenderer); | 132 element->setRenderer(newRenderer); |
133 newRenderer->setStyle(&style); // setStyle() can depend on renderer() alread
y being set. | 133 newRenderer->setStyle(&style); // setStyle() can depend on renderer() alread
y being set. |
134 | 134 |
135 if (FullscreenElementStack::isActiveFullScreenElement(element)) { | 135 if (FullscreenElementStack::isActiveFullScreenElement(*element)) { |
136 newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer
, &element->document()); | 136 newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer
, &element->document()); |
137 if (!newRenderer) | 137 if (!newRenderer) |
138 return; | 138 return; |
139 } | 139 } |
140 | 140 |
141 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. | 141 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. |
142 parentRenderer->addChild(newRenderer, nextRenderer); | 142 parentRenderer->addChild(newRenderer, nextRenderer); |
143 } | 143 } |
144 | 144 |
145 void RenderTreeBuilder::createRendererForTextIfNeeded() | 145 void RenderTreeBuilder::createRendererForTextIfNeeded() |
(...skipping 22 matching lines...) Expand all Loading... |
168 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 168 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
169 | 169 |
170 RenderObject* nextRenderer = this->nextRenderer(); | 170 RenderObject* nextRenderer = this->nextRenderer(); |
171 textNode->setRenderer(newRenderer); | 171 textNode->setRenderer(newRenderer); |
172 // Parent takes care of the animations, no need to call setAnimatableStyle. | 172 // Parent takes care of the animations, no need to call setAnimatableStyle. |
173 newRenderer->setStyle(m_style.release()); | 173 newRenderer->setStyle(m_style.release()); |
174 parentRenderer->addChild(newRenderer, nextRenderer); | 174 parentRenderer->addChild(newRenderer, nextRenderer); |
175 } | 175 } |
176 | 176 |
177 } | 177 } |
OLD | NEW |