Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Side by Side Diff: Source/core/rendering/svg/RenderSVGTextPath.cpp

Issue 191003007: Use isSVG*Element() helpers more in SVG code (Part 3) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 23 matching lines...) Expand all
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::isRenderableTextNode(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 ASSERT(child->node());
45 if (isSVGAltGlyphElement(*child->node()))
45 return false; 46 return false;
46 #endif 47 #endif
47 48
48 return child->isSVGInline() && !child->isSVGTextPath(); 49 return child->isSVGInline() && !child->isSVGTextPath();
49 } 50 }
50 51
51 Path RenderSVGTextPath::layoutPath() const 52 Path RenderSVGTextPath::layoutPath() const
52 { 53 {
53 SVGTextPathElement* textPathElement = toSVGTextPathElement(node()); 54 SVGTextPathElement* textPathElement = toSVGTextPathElement(node());
54 Element* targetElement = SVGURIReference::targetElementFromIRIString(textPat hElement->href()->currentValue()->value(), textPathElement->document()); 55 Element* targetElement = SVGURIReference::targetElementFromIRIString(textPat hElement->href()->currentValue()->value(), textPathElement->document());
55 if (!targetElement || !targetElement->hasTagName(SVGNames::pathTag)) 56 if (!isSVGPathElement(targetElement))
56 return Path(); 57 return Path();
57 58
58 SVGPathElement* pathElement = toSVGPathElement(targetElement); 59 SVGPathElement& pathElement = toSVGPathElement(*targetElement);
59 60
60 Path pathData; 61 Path pathData;
61 updatePathFromGraphicsElement(pathElement, pathData); 62 updatePathFromGraphicsElement(&pathElement, pathData);
62 63
63 // Spec: The transform attribute on the referenced 'path' element represent s a 64 // Spec: The transform attribute on the referenced 'path' element represent s a
64 // supplemental transformation relative to the current user coordinate syste m for 65 // supplemental transformation relative to the current user coordinate syste m for
65 // the current 'text' element, including any adjustments to the current user coordinate 66 // the current 'text' element, including any adjustments to the current user coordinate
66 // system due to a possible transform attribute on the current 'text' elemen t. 67 // system due to a possible transform attribute on the current 'text' elemen t.
67 // http://www.w3.org/TR/SVG/text.html#TextPathElement 68 // http://www.w3.org/TR/SVG/text.html#TextPathElement
68 pathData.transform(pathElement->animatedLocalTransform()); 69 pathData.transform(pathElement.animatedLocalTransform());
69 return pathData; 70 return pathData;
70 } 71 }
71 72
72 float RenderSVGTextPath::startOffset() const 73 float RenderSVGTextPath::startOffset() const
73 { 74 {
74 return toSVGTextPathElement(node())->startOffset()->currentValue()->valueAsP ercentage(); 75 return toSVGTextPathElement(node())->startOffset()->currentValue()->valueAsP ercentage();
75 } 76 }
76 77
77 } 78 }
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGTSpan.cpp ('k') | Source/core/rendering/svg/RenderSVGTransformableContainer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698