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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
117 return false; | 117 return false; |
118 } | 118 } |
119 | 119 |
120 void SVGTextPathElement::buildPendingResource() | 120 void SVGTextPathElement::buildPendingResource() |
121 { | 121 { |
122 clearResourceReferences(); | 122 clearResourceReferences(); |
123 if (!inDocument()) | 123 if (!inDocument()) |
124 return; | 124 return; |
125 | 125 |
126 AtomicString id; | 126 AtomicString id; |
127 Element* target = SVGURIReference::targetElementFromIRIString(hrefString(), treeScope(), &id); | 127 Element* target = nullptr; |
128 | |
129 if (inUseShadowTree()) { | |
fs
2016/03/14 12:54:10
Not sure this is actually needed. When the "real"
hyunjunekim2
2016/03/15 23:11:32
Change before.
| |
130 SVGElement* correspondingElement = this->correspondingElement(); | |
131 if (correspondingElement) | |
132 target = SVGURIReference::targetElementFromIRIString(hrefString(), c orrespondingElement->treeScope(), &id); | |
133 } else { | |
134 target = SVGURIReference::targetElementFromIRIString(hrefString(), treeS cope(), &id); | |
135 } | |
136 | |
128 if (!target) { | 137 if (!target) { |
129 // Do not register as pending if we are already pending this resource. | 138 // Do not register as pending if we are already pending this resource. |
130 if (document().accessSVGExtensions().isElementPendingResource(this, id)) | 139 if (document().accessSVGExtensions().isElementPendingResource(this, id)) |
131 return; | 140 return; |
132 | 141 |
133 if (!id.isEmpty()) { | 142 if (!id.isEmpty()) { |
134 document().accessSVGExtensions().addPendingResource(id, this); | 143 document().accessSVGExtensions().addPendingResource(id, this); |
135 ASSERT(hasPendingResources()); | 144 ASSERT(hasPendingResources()); |
136 } | 145 } |
137 } else if (isSVGPathElement(*target)) { | 146 } else if (isSVGPathElement(*target)) { |
(...skipping 17 matching lines...) Expand all Loading... | |
155 clearResourceReferences(); | 164 clearResourceReferences(); |
156 } | 165 } |
157 | 166 |
158 bool SVGTextPathElement::selfHasRelativeLengths() const | 167 bool SVGTextPathElement::selfHasRelativeLengths() const |
159 { | 168 { |
160 return m_startOffset->currentValue()->isRelative() | 169 return m_startOffset->currentValue()->isRelative() |
161 || SVGTextContentElement::selfHasRelativeLengths(); | 170 || SVGTextContentElement::selfHasRelativeLengths(); |
162 } | 171 } |
163 | 172 |
164 } // namespace blink | 173 } // namespace blink |
OLD | NEW |