| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 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 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include "config.h" | 29 #include "config.h" |
| 30 #include "core/frame/animation/CompositeAnimation.h" | 30 #include "core/frame/animation/CompositeAnimation.h" |
| 31 | 31 |
| 32 #include "CSSPropertyNames.h" | 32 #include "CSSPropertyNames.h" |
| 33 #include "core/frame/animation/AnimationControllerPrivate.h" | 33 #include "core/frame/animation/AnimationControllerPrivate.h" |
| 34 #include "core/frame/animation/CSSPropertyAnimation.h" | 34 #include "core/frame/animation/CSSPropertyAnimation.h" |
| 35 #include "core/frame/animation/ImplicitAnimation.h" | |
| 36 #include "core/frame/animation/KeyframeAnimation.h" | |
| 37 #include "core/rendering/style/RenderStyle.h" | 35 #include "core/rendering/style/RenderStyle.h" |
| 38 | 36 |
| 39 namespace WebCore { | 37 namespace WebCore { |
| 40 | 38 |
| 41 CompositeAnimation::~CompositeAnimation() | 39 CompositeAnimation::~CompositeAnimation() |
| 42 { | 40 { |
| 43 // Toss the refs to all animations, but make sure we remove them from | 41 // Toss the refs to all animations, but make sure we remove them from |
| 44 // any waiting lists first. | 42 // any waiting lists first. |
| 45 | 43 |
| 46 clearRenderer(); | 44 clearRenderer(); |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 503 ImplicitAnimation* anim = it->value.get(); | 501 ImplicitAnimation* anim = it->value.get(); |
| 504 if (anim->running()) | 502 if (anim->running()) |
| 505 ++count; | 503 ++count; |
| 506 } | 504 } |
| 507 } | 505 } |
| 508 | 506 |
| 509 return count; | 507 return count; |
| 510 } | 508 } |
| 511 | 509 |
| 512 } // namespace WebCore | 510 } // namespace WebCore |
| OLD | NEW |