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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 m_preventScheduledAnimationsChanges = true; | 269 m_preventScheduledAnimationsChanges = true; |
270 #endif | 270 #endif |
271 | 271 |
272 AnimationsVector animationsToApply; | 272 AnimationsVector animationsToApply; |
273 GroupedAnimationsMap::iterator end = m_scheduledAnimations.end(); | 273 GroupedAnimationsMap::iterator end = m_scheduledAnimations.end(); |
274 for (GroupedAnimationsMap::iterator it = m_scheduledAnimations.begin(); it !
= end; ++it) { | 274 for (GroupedAnimationsMap::iterator it = m_scheduledAnimations.begin(); it !
= end; ++it) { |
275 AnimationsVector* scheduled = it->value.get(); | 275 AnimationsVector* scheduled = it->value.get(); |
276 unsigned size = scheduled->size(); | 276 unsigned size = scheduled->size(); |
277 for (unsigned n = 0; n < size; n++) { | 277 for (unsigned n = 0; n < size; n++) { |
278 SVGSMILElement* animation = scheduled->at(n); | 278 SVGSMILElement* animation = scheduled->at(n); |
279 if (!animation->hasConditionsConnected()) | 279 animation->connectConditions(); |
280 animation->connectConditions(); | |
281 } | 280 } |
282 } | 281 } |
283 | 282 |
284 for (GroupedAnimationsMap::iterator it = m_scheduledAnimations.begin(); it !
= end; ++it) { | 283 for (GroupedAnimationsMap::iterator it = m_scheduledAnimations.begin(); it !
= end; ++it) { |
285 AnimationsVector* scheduled = it->value.get(); | 284 AnimationsVector* scheduled = it->value.get(); |
286 | 285 |
287 // Sort according to priority. Elements with later begin time have highe
r priority. | 286 // Sort according to priority. Elements with later begin time have highe
r priority. |
288 // In case of a tie, document order decides. | 287 // In case of a tie, document order decides. |
289 // FIXME: This should also consider timing relationships between the ele
ments. Dependents | 288 // FIXME: This should also consider timing relationships between the ele
ments. Dependents |
290 // have higher priority. | 289 // have higher priority. |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 animationsToApply[i]->applyResultsToTarget(); | 331 animationsToApply[i]->applyResultsToTarget(); |
333 | 332 |
334 #ifndef NDEBUG | 333 #ifndef NDEBUG |
335 m_preventScheduledAnimationsChanges = false; | 334 m_preventScheduledAnimationsChanges = false; |
336 #endif | 335 #endif |
337 | 336 |
338 startTimer(earliestFireTime, animationFrameDelay); | 337 startTimer(earliestFireTime, animationFrameDelay); |
339 } | 338 } |
340 | 339 |
341 } | 340 } |
OLD | NEW |