| 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 15 matching lines...) Expand all Loading... |
| 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 | 31 |
| 32 namespace WebCore { | 32 namespace WebCore { |
| 33 | 33 |
| 34 bool RenderSVGInline::isChildAllowed(RenderObject* child, RenderStyle* style) co
nst | 34 bool RenderSVGInline::isChildAllowed(RenderObject* child, RenderStyle* style) co
nst |
| 35 { | 35 { |
| 36 if (SVGRenderSupport::isEmptySVGInlineText(child)) | 36 if (child->isText()) |
| 37 return false; | 37 return SVGRenderSupport::isRenderableTextNode(child); |
| 38 | 38 |
| 39 if (node()->hasTagName(SVGNames::aTag)) { | 39 if (node()->hasTagName(SVGNames::aTag)) { |
| 40 // Disallow direct descendant 'a'. | 40 // Disallow direct descendant 'a'. |
| 41 if (child->node()->hasTagName(SVGNames::aTag)) | 41 if (child->node()->hasTagName(SVGNames::aTag)) |
| 42 return false; | 42 return false; |
| 43 } | 43 } |
| 44 | 44 |
| 45 if (!child->isSVGInline() && !child->isSVGInlineText()) | 45 if (!child->isSVGInline() && !child->isSVGInlineText()) |
| 46 return false; | 46 return false; |
| 47 | 47 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 RenderInline::removeChild(child); | 149 RenderInline::removeChild(child); |
| 150 return; | 150 return; |
| 151 } | 151 } |
| 152 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; | 152 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; |
| 153 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes); | 153 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes); |
| 154 RenderInline::removeChild(child); | 154 RenderInline::removeChild(child); |
| 155 textRenderer->subtreeChildWasRemoved(affectedAttributes); | 155 textRenderer->subtreeChildWasRemoved(affectedAttributes); |
| 156 } | 156 } |
| 157 | 157 |
| 158 } | 158 } |
| OLD | NEW |