OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> |
3 * Copyright (C) 2010 Rob Buis <rwlbuis@gmail.com> | 3 * Copyright (C) 2010 Rob Buis <rwlbuis@gmail.com> |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 return false; | 154 return false; |
155 } | 155 } |
156 | 156 |
157 void SVGTextPathElement::buildPendingResource() | 157 void SVGTextPathElement::buildPendingResource() |
158 { | 158 { |
159 clearResourceReferences(); | 159 clearResourceReferences(); |
160 if (!inDocument()) | 160 if (!inDocument()) |
161 return; | 161 return; |
162 | 162 |
163 String id; | 163 String id; |
164 Element* target = SVGURIReference::targetElementFromIRIString(href(), docume
nt(), &id); | 164 Element* target = SVGURIReference::targetElementFromIRIString(hrefCurrentVal
ue(), document(), &id); |
165 if (!target) { | 165 if (!target) { |
166 // Do not register as pending if we are already pending this resource. | 166 // Do not register as pending if we are already pending this resource. |
167 if (document()->accessSVGExtensions()->isElementPendingResource(this, id
)) | 167 if (document()->accessSVGExtensions()->isElementPendingResource(this, id
)) |
168 return; | 168 return; |
169 | 169 |
170 if (!id.isEmpty()) { | 170 if (!id.isEmpty()) { |
171 document()->accessSVGExtensions()->addPendingResource(id, this); | 171 document()->accessSVGExtensions()->addPendingResource(id, this); |
172 ASSERT(hasPendingResources()); | 172 ASSERT(hasPendingResources()); |
173 } | 173 } |
174 } else if (target->hasTagName(SVGNames::pathTag)) { | 174 } else if (target->hasTagName(SVGNames::pathTag)) { |
(...skipping 12 matching lines...) Expand all Loading... |
187 | 187 |
188 void SVGTextPathElement::removedFrom(ContainerNode* rootParent) | 188 void SVGTextPathElement::removedFrom(ContainerNode* rootParent) |
189 { | 189 { |
190 SVGTextContentElement::removedFrom(rootParent); | 190 SVGTextContentElement::removedFrom(rootParent); |
191 if (rootParent->inDocument()) | 191 if (rootParent->inDocument()) |
192 clearResourceReferences(); | 192 clearResourceReferences(); |
193 } | 193 } |
194 | 194 |
195 bool SVGTextPathElement::selfHasRelativeLengths() const | 195 bool SVGTextPathElement::selfHasRelativeLengths() const |
196 { | 196 { |
197 return startOffset().isRelative() | 197 return startOffsetCurrentValue().isRelative() |
198 || SVGTextContentElement::selfHasRelativeLengths(); | 198 || SVGTextContentElement::selfHasRelativeLengths(); |
199 } | 199 } |
200 | 200 |
201 } | 201 } |
OLD | NEW |