| 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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 | 279 |
| 280 SVGSMILElement* resultElement = 0; | 280 SVGSMILElement* resultElement = 0; |
| 281 unsigned size = scheduled->size(); | 281 unsigned size = scheduled->size(); |
| 282 for (unsigned n = 0; n < size; n++) { | 282 for (unsigned n = 0; n < size; n++) { |
| 283 SVGSMILElement* animation = scheduled->at(n); | 283 SVGSMILElement* animation = scheduled->at(n); |
| 284 ASSERT(animation->timeContainer() == this); | 284 ASSERT(animation->timeContainer() == this); |
| 285 ASSERT(animation->targetElement()); | 285 ASSERT(animation->targetElement()); |
| 286 ASSERT(animation->hasValidAttributeName()); | 286 ASSERT(animation->hasValidAttributeName()); |
| 287 | 287 |
| 288 // Results are accumulated to the first animation that animates and
contributes to a particular element/attribute pair. | 288 // Results are accumulated to the first animation that animates and
contributes to a particular element/attribute pair. |
| 289 // FIXME: we should ensure that resultElement is of an appropriate t
ype. |
| 289 if (!resultElement) { | 290 if (!resultElement) { |
| 290 if (!animation->hasValidAttributeType()) | 291 if (!animation->hasValidAttributeType()) |
| 291 continue; | 292 continue; |
| 292 resultElement = animation; | 293 resultElement = animation; |
| 293 } | 294 } |
| 294 | 295 |
| 295 // This will calculate the contribution from the animation and add i
t to the resultsElement. | 296 // This will calculate the contribution from the animation and add i
t to the resultsElement. |
| 296 if (!animation->progress(elapsed, resultElement, seekToTime) && resu
ltElement == animation) | 297 if (!animation->progress(elapsed, resultElement, seekToTime) && resu
ltElement == animation) |
| 297 resultElement = 0; | 298 resultElement = 0; |
| 298 | 299 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 | 336 |
| 336 if (animDiscard->inDocument()) { | 337 if (animDiscard->inDocument()) { |
| 337 animDiscard->remove(IGNORE_EXCEPTION); | 338 animDiscard->remove(IGNORE_EXCEPTION); |
| 338 ASSERT(!animDiscard->inDocument()); | 339 ASSERT(!animDiscard->inDocument()); |
| 339 } | 340 } |
| 340 } | 341 } |
| 341 } | 342 } |
| 342 } | 343 } |
| 343 | 344 |
| 344 } | 345 } |
| OLD | NEW |