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 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1103 if (animationIsContributing) { | 1103 if (animationIsContributing) { |
1104 if (oldActiveState == Inactive) | 1104 if (oldActiveState == Inactive) |
1105 startedActiveInterval(); | 1105 startedActiveInterval(); |
1106 | 1106 |
1107 updateAnimation(percent, repeat, resultElement); | 1107 updateAnimation(percent, repeat, resultElement); |
1108 m_lastPercent = percent; | 1108 m_lastPercent = percent; |
1109 m_lastRepeat = repeat; | 1109 m_lastRepeat = repeat; |
1110 } | 1110 } |
1111 | 1111 |
1112 if (oldActiveState == Active && m_activeState != Active) { | 1112 if (oldActiveState == Active && m_activeState != Active) { |
1113 endedActiveInterval(); | 1113 endedActiveInterval(); |
pdr.
2013/08/01 21:58:51
Will this endedActiveInterval() call break dynamic
| |
1114 if (m_activeState != Frozen) | 1114 if (m_activeState != Frozen && this == resultElement) |
1115 clearAnimatedType(m_targetElement); | 1115 clearAnimatedType(m_targetElement); |
1116 } | 1116 } |
1117 | 1117 |
1118 m_nextProgressTime = calculateNextProgressTime(elapsed); | 1118 m_nextProgressTime = calculateNextProgressTime(elapsed); |
1119 return animationIsContributing; | 1119 return animationIsContributing; |
1120 } | 1120 } |
1121 | 1121 |
1122 void SVGSMILElement::notifyDependentsIntervalChanged(NewOrExistingInterval newOr Existing) | 1122 void SVGSMILElement::notifyDependentsIntervalChanged(NewOrExistingInterval newOr Existing) |
1123 { | 1123 { |
1124 ASSERT(m_intervalBegin.isFinite()); | 1124 ASSERT(m_intervalBegin.isFinite()); |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1185 addBeginTime(elapsed, elapsed); | 1185 addBeginTime(elapsed, elapsed); |
1186 } | 1186 } |
1187 | 1187 |
1188 void SVGSMILElement::endedActiveInterval() | 1188 void SVGSMILElement::endedActiveInterval() |
1189 { | 1189 { |
1190 clearTimesWithDynamicOrigins(m_beginTimes); | 1190 clearTimesWithDynamicOrigins(m_beginTimes); |
1191 clearTimesWithDynamicOrigins(m_endTimes); | 1191 clearTimesWithDynamicOrigins(m_endTimes); |
1192 } | 1192 } |
1193 | 1193 |
1194 } | 1194 } |
OLD | NEW |