| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2007 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2007 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> | 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> |
| 5 * Copyright (C) 2010 Apple Inc. All rights reserved. | 5 * Copyright (C) 2010 Apple Inc. All rights reserved. |
| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 SVGGraphicsElement::svgAttributeChanged(attrName); | 128 SVGGraphicsElement::svgAttributeChanged(attrName); |
| 129 return; | 129 return; |
| 130 } | 130 } |
| 131 | 131 |
| 132 SVGElementInstance::InvalidationGuard invalidationGuard(this); | 132 SVGElementInstance::InvalidationGuard invalidationGuard(this); |
| 133 | 133 |
| 134 // Unlike other SVG*Element classes, SVGAElement only listens to SVGURIRefer
ence changes | 134 // Unlike other SVG*Element classes, SVGAElement only listens to SVGURIRefer
ence changes |
| 135 // as none of the other properties changes the linking behaviour for our <a>
element. | 135 // as none of the other properties changes the linking behaviour for our <a>
element. |
| 136 if (SVGURIReference::isKnownAttribute(attrName)) { | 136 if (SVGURIReference::isKnownAttribute(attrName)) { |
| 137 bool wasLink = isLink(); | 137 bool wasLink = isLink(); |
| 138 setIsLink(!hrefCurrentValue().isNull()); | 138 setIsLink(!hrefCurrentValue().isNull() && !shouldProhibitLinks(this)); |
| 139 | 139 |
| 140 if (wasLink != isLink()) | 140 if (wasLink != isLink()) |
| 141 setNeedsStyleRecalc(); | 141 setNeedsStyleRecalc(); |
| 142 } | 142 } |
| 143 } | 143 } |
| 144 | 144 |
| 145 RenderObject* SVGAElement::createRenderer(RenderStyle*) | 145 RenderObject* SVGAElement::createRenderer(RenderStyle*) |
| 146 { | 146 { |
| 147 if (parentNode() && parentNode()->isSVGElement() && toSVGElement(parentNode(
))->isTextContent()) | 147 if (parentNode() && parentNode()->isSVGElement() && toSVGElement(parentNode(
))->isTextContent()) |
| 148 return new RenderSVGInline(this); | 148 return new RenderSVGInline(this); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 // The 'a' element may contain any element that its parent may contain, exce
pt itself. | 235 // The 'a' element may contain any element that its parent may contain, exce
pt itself. |
| 236 if (childContext.node()->hasTagName(SVGNames::aTag)) | 236 if (childContext.node()->hasTagName(SVGNames::aTag)) |
| 237 return false; | 237 return false; |
| 238 if (parentNode() && parentNode()->isSVGElement()) | 238 if (parentNode() && parentNode()->isSVGElement()) |
| 239 return parentNode()->childShouldCreateRenderer(childContext); | 239 return parentNode()->childShouldCreateRenderer(childContext); |
| 240 | 240 |
| 241 return SVGElement::childShouldCreateRenderer(childContext); | 241 return SVGElement::childShouldCreateRenderer(childContext); |
| 242 } | 242 } |
| 243 | 243 |
| 244 } // namespace WebCore | 244 } // namespace WebCore |
| OLD | NEW |