| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> | 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> |
| 3 * Copyright (C) 2006 Apple Inc. All rights reserved. | 3 * Copyright (C) 2006 Apple Inc. All rights reserved. |
| 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 | 21 |
| 22 #include "config.h" | 22 #include "config.h" |
| 23 | 23 |
| 24 #include "core/rendering/svg/RenderSVGInline.h" | 24 #include "core/rendering/svg/RenderSVGInline.h" |
| 25 | 25 |
| 26 #include "SVGNames.h" | 26 #include "SVGNames.h" |
| 27 #include "core/rendering/svg/RenderSVGText.h" | 27 #include "core/rendering/svg/RenderSVGText.h" |
| 28 #include "core/rendering/svg/SVGInlineFlowBox.h" | 28 #include "core/rendering/svg/SVGInlineFlowBox.h" |
| 29 #include "core/rendering/svg/SVGRenderSupport.h" | 29 #include "core/rendering/svg/SVGRenderSupport.h" |
| 30 #include "core/rendering/svg/SVGResourcesCache.h" | 30 #include "core/rendering/svg/SVGResourcesCache.h" |
| 31 #include "core/svg/SVGAElement.h" |
| 31 | 32 |
| 32 namespace WebCore { | 33 namespace WebCore { |
| 33 | 34 |
| 34 bool RenderSVGInline::isChildAllowed(RenderObject* child, RenderStyle* style) co
nst | 35 bool RenderSVGInline::isChildAllowed(RenderObject* child, RenderStyle* style) co
nst |
| 35 { | 36 { |
| 36 if (child->isText()) | 37 if (child->isText()) |
| 37 return SVGRenderSupport::isRenderableTextNode(child); | 38 return SVGRenderSupport::isRenderableTextNode(child); |
| 38 | 39 |
| 39 if (node()->hasTagName(SVGNames::aTag)) { | 40 if (isSVGAElement(*node())) { |
| 40 // Disallow direct descendant 'a'. | 41 // Disallow direct descendant 'a'. |
| 41 if (child->node()->hasTagName(SVGNames::aTag)) | 42 if (isSVGAElement(*child->node())) |
| 42 return false; | 43 return false; |
| 43 } | 44 } |
| 44 | 45 |
| 45 if (!child->isSVGInline() && !child->isSVGInlineText()) | 46 if (!child->isSVGInline() && !child->isSVGInlineText()) |
| 46 return false; | 47 return false; |
| 47 | 48 |
| 48 return RenderInline::isChildAllowed(child, style); | 49 return RenderInline::isChildAllowed(child, style); |
| 49 } | 50 } |
| 50 | 51 |
| 51 RenderSVGInline::RenderSVGInline(Element* element) | 52 RenderSVGInline::RenderSVGInline(Element* element) |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 RenderInline::removeChild(child); | 150 RenderInline::removeChild(child); |
| 150 return; | 151 return; |
| 151 } | 152 } |
| 152 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; | 153 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; |
| 153 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes); | 154 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes); |
| 154 RenderInline::removeChild(child); | 155 RenderInline::removeChild(child); |
| 155 textRenderer->subtreeChildWasRemoved(affectedAttributes); | 156 textRenderer->subtreeChildWasRemoved(affectedAttributes); |
| 156 } | 157 } |
| 157 | 158 |
| 158 } | 159 } |
| OLD | NEW |