| 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 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 return; | 348 return; |
| 349 | 349 |
| 350 // We do update the style and the animation property independent of each | 350 // We do update the style and the animation property independent of each |
| 351 // other. | 351 // other. |
| 352 if (m_animator.isAnimatingCSSProperty()) { | 352 if (m_animator.isAnimatingCSSProperty()) { |
| 353 // CSS properties animation code-path. | 353 // CSS properties animation code-path. |
| 354 // Convert the result of the animation to a String and apply it as CSS | 354 // Convert the result of the animation to a String and apply it as CSS |
| 355 // property on the target. | 355 // property on the target. |
| 356 MutableStylePropertySet* propertySet = | 356 MutableStylePropertySet* propertySet = |
| 357 targetElement()->ensureAnimatedSMILStyleProperties(); | 357 targetElement()->ensureAnimatedSMILStyleProperties(); |
| 358 if (propertySet->setProperty(m_animator.cssProperty(), | 358 if (propertySet |
| 359 m_animatedProperty->valueAsString(), false, | 359 ->setProperty(m_animator.cssProperty(), |
| 360 0)) { | 360 m_animatedProperty->valueAsString(), false, 0) |
| 361 .didChange) { |
| 361 targetElement()->setNeedsStyleRecalc( | 362 targetElement()->setNeedsStyleRecalc( |
| 362 LocalStyleChange, | 363 LocalStyleChange, |
| 363 StyleChangeReasonForTracing::create(StyleChangeReason::Animation)); | 364 StyleChangeReasonForTracing::create(StyleChangeReason::Animation)); |
| 364 } | 365 } |
| 365 } | 366 } |
| 366 if (m_animator.isAnimatingSVGDom()) { | 367 if (m_animator.isAnimatingSVGDom()) { |
| 367 // SVG DOM animVal animation code-path. | 368 // SVG DOM animVal animation code-path. |
| 368 // At this point the SVG DOM values are already changed, unlike for CSS. | 369 // At this point the SVG DOM values are already changed, unlike for CSS. |
| 369 // We only have to trigger update notifications here. | 370 // We only have to trigger update notifications here. |
| 370 targetElement()->invalidateAnimatedAttribute(attributeName()); | 371 targetElement()->invalidateAnimatedAttribute(attributeName()); |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 460 DEFINE_TRACE(SVGAnimateElement) { | 461 DEFINE_TRACE(SVGAnimateElement) { |
| 461 visitor->trace(m_fromProperty); | 462 visitor->trace(m_fromProperty); |
| 462 visitor->trace(m_toProperty); | 463 visitor->trace(m_toProperty); |
| 463 visitor->trace(m_toAtEndOfDurationProperty); | 464 visitor->trace(m_toAtEndOfDurationProperty); |
| 464 visitor->trace(m_animatedProperty); | 465 visitor->trace(m_animatedProperty); |
| 465 visitor->trace(m_animator); | 466 visitor->trace(m_animator); |
| 466 SVGAnimationElement::trace(visitor); | 467 SVGAnimationElement::trace(visitor); |
| 467 } | 468 } |
| 468 | 469 |
| 469 } // namespace blink | 470 } // namespace blink |
| OLD | NEW |