OLD | NEW |
1 /* | 1 /* |
2 * This file is part of the WebKit project. | 2 * This file is part of the WebKit project. |
3 * | 3 * |
4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> | 4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> |
5 * Copyright (C) 2006 Apple Computer Inc. | 5 * Copyright (C) 2006 Apple Computer Inc. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 18 matching lines...) Expand all Loading... |
29 | 29 |
30 namespace WebCore { | 30 namespace WebCore { |
31 | 31 |
32 RenderSVGTSpan::RenderSVGTSpan(Element* element) | 32 RenderSVGTSpan::RenderSVGTSpan(Element* element) |
33 : RenderSVGInline(element) | 33 : RenderSVGInline(element) |
34 { | 34 { |
35 } | 35 } |
36 | 36 |
37 bool RenderSVGTSpan::isChildAllowed(RenderObject* child, RenderStyle*) const | 37 bool RenderSVGTSpan::isChildAllowed(RenderObject* child, RenderStyle*) const |
38 { | 38 { |
39 // Always allow text (except empty textnodes). | 39 // Always allow text (except empty textnodes and <br>). |
40 if (child->isText()) | 40 if (child->isText()) |
41 return !SVGRenderSupport::isEmptySVGInlineText(child); | 41 return SVGRenderSupport::isRenderableTextNode(child); |
42 | 42 |
43 #if ENABLE(SVG_FONTS) | 43 #if ENABLE(SVG_FONTS) |
44 // Only allow other types of children if this is not an 'altGlyph'. | 44 // Only allow other types of children if this is not an 'altGlyph'. |
45 if (node()->hasTagName(SVGNames::altGlyphTag)) | 45 if (node()->hasTagName(SVGNames::altGlyphTag)) |
46 return false; | 46 return false; |
47 #endif | 47 #endif |
48 | 48 |
49 return child->isSVGInline() && !child->isSVGTextPath(); | 49 return child->isSVGInline() && !child->isSVGTextPath(); |
50 } | 50 } |
51 | 51 |
52 } | 52 } |
OLD | NEW |