| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 namespace WebCore { | 30 namespace WebCore { |
| 31 | 31 |
| 32 RenderSVGTextPath::RenderSVGTextPath(Element* element) | 32 RenderSVGTextPath::RenderSVGTextPath(Element* element) |
| 33 : RenderSVGInline(element) | 33 : RenderSVGInline(element) |
| 34 { | 34 { |
| 35 } | 35 } |
| 36 | 36 |
| 37 bool RenderSVGTextPath::isChildAllowed(RenderObject* child, RenderStyle*) const | 37 bool RenderSVGTextPath::isChildAllowed(RenderObject* child, RenderStyle*) const |
| 38 { | 38 { |
| 39 if (child->isText()) | 39 if (child->isText()) |
| 40 return !SVGRenderSupport::isEmptySVGInlineText(child); | 40 return SVGRenderSupport::isRenderableTextNode(child); |
| 41 | 41 |
| 42 #if ENABLE(SVG_FONTS) | 42 #if ENABLE(SVG_FONTS) |
| 43 // 'altGlyph' is supported by the content model for 'textPath', but... | 43 // 'altGlyph' is supported by the content model for 'textPath', but... |
| 44 if (child->node()->hasTagName(SVGNames::altGlyphTag)) | 44 if (child->node()->hasTagName(SVGNames::altGlyphTag)) |
| 45 return false; | 45 return false; |
| 46 #endif | 46 #endif |
| 47 | 47 |
| 48 return child->isSVGInline() && !child->isSVGTextPath(); | 48 return child->isSVGInline() && !child->isSVGTextPath(); |
| 49 } | 49 } |
| 50 | 50 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 68 pathData.transform(pathElement->animatedLocalTransform()); | 68 pathData.transform(pathElement->animatedLocalTransform()); |
| 69 return pathData; | 69 return pathData; |
| 70 } | 70 } |
| 71 | 71 |
| 72 float RenderSVGTextPath::startOffset() const | 72 float RenderSVGTextPath::startOffset() const |
| 73 { | 73 { |
| 74 return toSVGTextPathElement(node())->startOffset()->currentValue()->valueAsP
ercentage(); | 74 return toSVGTextPathElement(node())->startOffset()->currentValue()->valueAsP
ercentage(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 } | 77 } |
| OLD | NEW |