| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde
.org> | 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde
.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) 2008 Apple Inc. All rights reserved. | 4 * Copyright (C) 2008 Apple Inc. All rights reserved. |
| 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> | 6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 | 106 |
| 107 // The rare data cleanup may have caused other SVG nodes to be deleted, | 107 // The rare data cleanup may have caused other SVG nodes to be deleted, |
| 108 // modifying the rare data map. Do not rely on the existing iterator. | 108 // modifying the rare data map. Do not rely on the existing iterator. |
| 109 ASSERT(rareDataMap.contains(this)); | 109 ASSERT(rareDataMap.contains(this)); |
| 110 rareDataMap.remove(this); | 110 rareDataMap.remove(this); |
| 111 // Clear HasSVGRareData flag now so that we are in a consistent state wh
en | 111 // Clear HasSVGRareData flag now so that we are in a consistent state wh
en |
| 112 // calling rebuildAllElementReferencesForTarget() and | 112 // calling rebuildAllElementReferencesForTarget() and |
| 113 // removeAllElementReferencesForTarget() below. | 113 // removeAllElementReferencesForTarget() below. |
| 114 clearHasSVGRareData(); | 114 clearHasSVGRareData(); |
| 115 } | 115 } |
| 116 #if !ENABLE(OILPAN) |
| 117 // With Oilpan, either removedFrom has been called or the document is dead |
| 118 // as well and there is no reason to clear out the extensions. |
| 116 document().accessSVGExtensions().rebuildAllElementReferencesForTarget(this); | 119 document().accessSVGExtensions().rebuildAllElementReferencesForTarget(this); |
| 117 document().accessSVGExtensions().removeAllElementReferencesForTarget(this); | 120 document().accessSVGExtensions().removeAllElementReferencesForTarget(this); |
| 121 #endif |
| 118 } | 122 } |
| 119 | 123 |
| 120 void SVGElement::willRecalcStyle(StyleRecalcChange change) | 124 void SVGElement::willRecalcStyle(StyleRecalcChange change) |
| 121 { | 125 { |
| 122 if (!hasSVGRareData()) | 126 if (!hasSVGRareData()) |
| 123 return; | 127 return; |
| 124 // If the style changes because of a regular property change (not induced by
SMIL animations themselves) | 128 // If the style changes because of a regular property change (not induced by
SMIL animations themselves) |
| 125 // reset the "computed style without SMIL style properties", so the base val
ue change gets reflected. | 129 // reset the "computed style without SMIL style properties", so the base val
ue change gets reflected. |
| 126 if (change > NoChange || needsStyleRecalc()) | 130 if (change > NoChange || needsStyleRecalc()) |
| 127 svgRareData()->setNeedsOverrideComputedStyleUpdate(); | 131 svgRareData()->setNeedsOverrideComputedStyleUpdate(); |
| (...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1109 animatableAttributes.add(SVGNames::zAttr); | 1113 animatableAttributes.add(SVGNames::zAttr); |
| 1110 } | 1114 } |
| 1111 | 1115 |
| 1112 if (name == classAttr) | 1116 if (name == classAttr) |
| 1113 return true; | 1117 return true; |
| 1114 | 1118 |
| 1115 return animatableAttributes.contains(name); | 1119 return animatableAttributes.contains(name); |
| 1116 } | 1120 } |
| 1117 #endif | 1121 #endif |
| 1118 } | 1122 } |
| OLD | NEW |