OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
608 if (m_targetElement) | 608 if (m_targetElement) |
609 disconnectSyncBaseConditions(); | 609 disconnectSyncBaseConditions(); |
610 | 610 |
611 // If the animation state is not Inactive, always reset to a clear state | 611 // If the animation state is not Inactive, always reset to a clear state |
612 // before leaving the old target element. | 612 // before leaving the old target element. |
613 if (m_activeState != Inactive) | 613 if (m_activeState != Inactive) |
614 endedActiveInterval(); | 614 endedActiveInterval(); |
615 | 615 |
616 m_targetElement = target; | 616 m_targetElement = target; |
617 didChangeAnimationTarget(); | 617 didChangeAnimationTarget(); |
| 618 |
| 619 // If the animation is scheduled and there's an active interval, then |
| 620 // revalidate the animation value. |
| 621 if (m_activeState != Inactive && m_isScheduled) |
| 622 startedActiveInterval(); |
618 } | 623 } |
619 | 624 |
620 SMILTime SVGSMILElement::elapsed() const { | 625 SMILTime SVGSMILElement::elapsed() const { |
621 return m_timeContainer ? m_timeContainer->elapsed() : 0; | 626 return m_timeContainer ? m_timeContainer->elapsed() : 0; |
622 } | 627 } |
623 | 628 |
624 bool SVGSMILElement::isFrozen() const { | 629 bool SVGSMILElement::isFrozen() const { |
625 return m_activeState == Frozen; | 630 return m_activeState == Frozen; |
626 } | 631 } |
627 | 632 |
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1267 visitor->trace(m_targetElement); | 1272 visitor->trace(m_targetElement); |
1268 visitor->trace(m_targetIdObserver); | 1273 visitor->trace(m_targetIdObserver); |
1269 visitor->trace(m_timeContainer); | 1274 visitor->trace(m_timeContainer); |
1270 visitor->trace(m_conditions); | 1275 visitor->trace(m_conditions); |
1271 visitor->trace(m_syncBaseDependents); | 1276 visitor->trace(m_syncBaseDependents); |
1272 SVGElement::trace(visitor); | 1277 SVGElement::trace(visitor); |
1273 SVGTests::trace(visitor); | 1278 SVGTests::trace(visitor); |
1274 } | 1279 } |
1275 | 1280 |
1276 } // namespace blink | 1281 } // namespace blink |
OLD | NEW |