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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 | 107 |
108 // The rare data cleanup may have caused other SVG nodes to be deleted, | 108 // The rare data cleanup may have caused other SVG nodes to be deleted, |
109 // modifying the rare data map. Do not rely on the existing iterator. | 109 // modifying the rare data map. Do not rely on the existing iterator. |
110 ASSERT(rareDataMap.contains(this)); | 110 ASSERT(rareDataMap.contains(this)); |
111 rareDataMap.remove(this); | 111 rareDataMap.remove(this); |
112 // Clear HasSVGRareData flag now so that we are in a consistent state wh
en | 112 // Clear HasSVGRareData flag now so that we are in a consistent state wh
en |
113 // calling rebuildAllElementReferencesForTarget() and | 113 // calling rebuildAllElementReferencesForTarget() and |
114 // removeAllElementReferencesForTarget() below. | 114 // removeAllElementReferencesForTarget() below. |
115 clearHasSVGRareData(); | 115 clearHasSVGRareData(); |
116 } | 116 } |
117 #endif | 117 |
| 118 // With Oilpan, either removedFrom has been called or the document is dead |
| 119 // as well and there is no reason to clear out the extensions. |
118 document().accessSVGExtensions().rebuildAllElementReferencesForTarget(this); | 120 document().accessSVGExtensions().rebuildAllElementReferencesForTarget(this); |
119 document().accessSVGExtensions().removeAllElementReferencesForTarget(this); | 121 document().accessSVGExtensions().removeAllElementReferencesForTarget(this); |
| 122 #endif |
120 } | 123 } |
121 | 124 |
122 void SVGElement::willRecalcStyle(StyleRecalcChange change) | 125 void SVGElement::willRecalcStyle(StyleRecalcChange change) |
123 { | 126 { |
124 if (!hasSVGRareData()) | 127 if (!hasSVGRareData()) |
125 return; | 128 return; |
126 // If the style changes because of a regular property change (not induced by
SMIL animations themselves) | 129 // If the style changes because of a regular property change (not induced by
SMIL animations themselves) |
127 // reset the "computed style without SMIL style properties", so the base val
ue change gets reflected. | 130 // reset the "computed style without SMIL style properties", so the base val
ue change gets reflected. |
128 if (change > NoChange || needsStyleRecalc()) | 131 if (change > NoChange || needsStyleRecalc()) |
129 svgRareData()->setNeedsOverrideComputedStyleUpdate(); | 132 svgRareData()->setNeedsOverrideComputedStyleUpdate(); |
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1113 animatableAttributes.add(SVGNames::zAttr); | 1116 animatableAttributes.add(SVGNames::zAttr); |
1114 } | 1117 } |
1115 | 1118 |
1116 if (name == classAttr) | 1119 if (name == classAttr) |
1117 return true; | 1120 return true; |
1118 | 1121 |
1119 return animatableAttributes.contains(name); | 1122 return animatableAttributes.contains(name); |
1120 } | 1123 } |
1121 #endif | 1124 #endif |
1122 } | 1125 } |
OLD | NEW |