| 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 |
| 11 * License as published by the Free Software Foundation; either | 11 * License as published by the Free Software Foundation; either |
| 12 * version 2 of the License, or (at your option) any later version. | 12 * version 2 of the License, or (at your option) any later version. |
| 13 * | 13 * |
| 14 * This library is distributed in the hope that it will be useful, | 14 * This library is distributed in the hope that it will be useful, |
| 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 17 * Library General Public License for more details. | 17 * Library General Public License for more details. |
| 18 * | 18 * |
| 19 * You should have received a copy of the GNU Library General Public License | 19 * You should have received a copy of the GNU Library General Public License |
| 20 * along with this library; see the file COPYING.LIB. If not, write to | 20 * along with this library; see the file COPYING.LIB. If not, write to |
| 21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 22 * Boston, MA 02110-1301, USA. | 22 * Boston, MA 02110-1301, USA. |
| 23 * | 23 * |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/dom/RenderTreeBuilder.h" | 27 #include "core/dom/RenderTreeBuilder.h" |
| 28 | 28 |
| 29 #include "core/HTMLNames.h" | 29 #include "core/HTMLNames.h" |
| 30 #include "core/SVGNames.h" | |
| 31 #include "core/css/resolver/StyleResolver.h" | 30 #include "core/css/resolver/StyleResolver.h" |
| 32 #include "core/dom/FullscreenElementStack.h" | 31 #include "core/dom/FullscreenElementStack.h" |
| 33 #include "core/dom/Node.h" | 32 #include "core/dom/Node.h" |
| 34 #include "core/dom/Text.h" | 33 #include "core/dom/Text.h" |
| 35 #include "core/rendering/RenderFullScreen.h" | 34 #include "core/rendering/RenderFullScreen.h" |
| 36 #include "core/rendering/RenderObject.h" | 35 #include "core/rendering/RenderObject.h" |
| 37 #include "core/rendering/RenderText.h" | 36 #include "core/rendering/RenderText.h" |
| 38 #include "core/rendering/RenderView.h" | 37 #include "core/rendering/RenderView.h" |
| 39 #include "core/svg/SVGElement.h" | |
| 40 #include "platform/RuntimeEnabledFeatures.h" | 38 #include "platform/RuntimeEnabledFeatures.h" |
| 41 | 39 |
| 42 namespace WebCore { | 40 namespace WebCore { |
| 43 | 41 |
| 44 RenderObject* RenderTreeBuilder::nextRenderer() const | 42 RenderObject* RenderTreeBuilder::nextRenderer() const |
| 45 { | 43 { |
| 46 ASSERT(m_renderingParent); | 44 ASSERT(m_renderingParent); |
| 47 | 45 |
| 48 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; | 46 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; |
| 49 | 47 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 71 return m_node->document().renderView(); | 69 return m_node->document().renderView(); |
| 72 } | 70 } |
| 73 | 71 |
| 74 return m_renderingParent->renderer(); | 72 return m_renderingParent->renderer(); |
| 75 } | 73 } |
| 76 | 74 |
| 77 bool RenderTreeBuilder::shouldCreateRenderer() const | 75 bool RenderTreeBuilder::shouldCreateRenderer() const |
| 78 { | 76 { |
| 79 if (!m_renderingParent) | 77 if (!m_renderingParent) |
| 80 return false; | 78 return false; |
| 81 if (m_node->isSVGElement()) { | |
| 82 // SVG elements only render when inside <svg>, or if the element is an <
svg> itself. | |
| 83 if (!isSVGSVGElement(*m_node) && !m_renderingParent->isSVGElement()) | |
| 84 return false; | |
| 85 if (!toSVGElement(m_node)->isValid()) | |
| 86 return false; | |
| 87 } | |
| 88 RenderObject* parentRenderer = this->parentRenderer(); | 79 RenderObject* parentRenderer = this->parentRenderer(); |
| 89 if (!parentRenderer) | 80 if (!parentRenderer) |
| 90 return false; | 81 return false; |
| 91 if (!parentRenderer->canHaveChildren()) | 82 if (!parentRenderer->canHaveChildren()) |
| 92 return false; | 83 return false; |
| 93 return true; | 84 return true; |
| 94 } | 85 } |
| 95 | 86 |
| 96 RenderStyle& RenderTreeBuilder::style() const | 87 RenderStyle& RenderTreeBuilder::style() const |
| 97 { | 88 { |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 168 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
| 178 | 169 |
| 179 RenderObject* nextRenderer = this->nextRenderer(); | 170 RenderObject* nextRenderer = this->nextRenderer(); |
| 180 textNode->setRenderer(newRenderer); | 171 textNode->setRenderer(newRenderer); |
| 181 // Parent takes care of the animations, no need to call setAnimatableStyle. | 172 // Parent takes care of the animations, no need to call setAnimatableStyle. |
| 182 newRenderer->setStyle(m_style.release()); | 173 newRenderer->setStyle(m_style.release()); |
| 183 parentRenderer->addChild(newRenderer, nextRenderer); | 174 parentRenderer->addChild(newRenderer, nextRenderer); |
| 184 } | 175 } |
| 185 | 176 |
| 186 } | 177 } |
| OLD | NEW |