OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org> |
3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006 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) Research In Motion Limited 2011. All rights reserved. | 5 * Copyright (C) Research In Motion Limited 2011. 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 } | 282 } |
283 | 283 |
284 void SVGAnimateElement::clearAnimatedType() | 284 void SVGAnimateElement::clearAnimatedType() |
285 { | 285 { |
286 if (!m_animatedProperty) | 286 if (!m_animatedProperty) |
287 return; | 287 return; |
288 | 288 |
289 // The animated property lock is held for the "result animation" (see SMILTi
meContainer::updateAnimations()) | 289 // The animated property lock is held for the "result animation" (see SMILTi
meContainer::updateAnimations()) |
290 // while we're processing an animation group. We will very likely crash late
r if we clear the animated type | 290 // while we're processing an animation group. We will very likely crash late
r if we clear the animated type |
291 // while the lock is held. See crbug.com/581546. | 291 // while the lock is held. See crbug.com/581546. |
292 RELEASE_ASSERT(!animatedTypeIsLocked()); | 292 DCHECK(!animatedTypeIsLocked()); |
293 | 293 |
294 SVGElement* targetElement = this->targetElement(); | 294 SVGElement* targetElement = this->targetElement(); |
295 if (!targetElement) { | 295 if (!targetElement) { |
296 m_animatedProperty.clear(); | 296 m_animatedProperty.clear(); |
297 return; | 297 return; |
298 } | 298 } |
299 | 299 |
300 ShouldApplyAnimationType shouldApply = shouldApplyAnimation(targetElement, a
ttributeName()); | 300 ShouldApplyAnimationType shouldApply = shouldApplyAnimation(targetElement, a
ttributeName()); |
301 if (shouldApply == ApplyXMLandCSSAnimation) { | 301 if (shouldApply == ApplyXMLandCSSAnimation) { |
302 removeCSSPropertyFromTargetAndInstances(targetElement, attributeName()); | 302 removeCSSPropertyFromTargetAndInstances(targetElement, attributeName()); |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
405 { | 405 { |
406 visitor->trace(m_fromProperty); | 406 visitor->trace(m_fromProperty); |
407 visitor->trace(m_toProperty); | 407 visitor->trace(m_toProperty); |
408 visitor->trace(m_toAtEndOfDurationProperty); | 408 visitor->trace(m_toAtEndOfDurationProperty); |
409 visitor->trace(m_animatedProperty); | 409 visitor->trace(m_animatedProperty); |
410 visitor->trace(m_animator); | 410 visitor->trace(m_animator); |
411 SVGAnimationElement::trace(visitor); | 411 SVGAnimationElement::trace(visitor); |
412 } | 412 } |
413 | 413 |
414 } // namespace blink | 414 } // namespace blink |
OLD | NEW |