| 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 23 matching lines...) Expand all Loading... |
| 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 (SVGRenderSupport::isEmptySVGInlineText(child)) |
| 37 return false; | 37 return false; |
| 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 |
| 45 if (!child->isSVGInline() && !child->isSVGInlineText()) |
| 46 return false; |
| 47 |
| 44 return RenderInline::isChildAllowed(child, style); | 48 return RenderInline::isChildAllowed(child, style); |
| 45 } | 49 } |
| 46 | 50 |
| 47 RenderSVGInline::RenderSVGInline(Element* element) | 51 RenderSVGInline::RenderSVGInline(Element* element) |
| 48 : RenderInline(element) | 52 : RenderInline(element) |
| 49 { | 53 { |
| 50 setAlwaysCreateLineBoxes(); | 54 setAlwaysCreateLineBoxes(); |
| 51 } | 55 } |
| 52 | 56 |
| 53 InlineFlowBox* RenderSVGInline::createInlineFlowBox() | 57 InlineFlowBox* RenderSVGInline::createInlineFlowBox() |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 RenderInline::removeChild(child); | 149 RenderInline::removeChild(child); |
| 146 return; | 150 return; |
| 147 } | 151 } |
| 148 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; | 152 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; |
| 149 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes); | 153 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes); |
| 150 RenderInline::removeChild(child); | 154 RenderInline::removeChild(child); |
| 151 textRenderer->subtreeChildWasRemoved(affectedAttributes); | 155 textRenderer->subtreeChildWasRemoved(affectedAttributes); |
| 152 } | 156 } |
| 153 | 157 |
| 154 } | 158 } |
| OLD | NEW |