| 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 16 matching lines...) Expand all Loading... |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include "config.h" | 29 #include "config.h" |
| 30 #include "core/page/animation/CompositeAnimation.h" | 30 #include "core/page/animation/CompositeAnimation.h" |
| 31 | 31 |
| 32 #include "CSSPropertyNames.h" | 32 #include "CSSPropertyNames.h" |
| 33 #include "core/page/animation/AnimationControllerPrivate.h" | 33 #include "core/page/animation/AnimationControllerPrivate.h" |
| 34 #include "core/page/animation/CSSPropertyAnimation.h" | 34 #include "core/page/animation/CSSPropertyAnimation.h" |
| 35 #include "core/page/animation/ImplicitAnimation.h" | 35 #include "core/page/animation/ImplicitAnimation.h" |
| 36 #include "core/page/animation/KeyframeAnimation.h" | 36 #include "core/page/animation/KeyframeAnimation.h" |
| 37 #include "core/rendering/RenderObject.h" | |
| 38 #include "core/rendering/style/RenderStyle.h" | 37 #include "core/rendering/style/RenderStyle.h" |
| 39 | 38 |
| 40 namespace WebCore { | 39 namespace WebCore { |
| 41 | 40 |
| 42 CompositeAnimation::~CompositeAnimation() | 41 CompositeAnimation::~CompositeAnimation() |
| 43 { | 42 { |
| 44 // Toss the refs to all animations, but make sure we remove them from | 43 // Toss the refs to all animations, but make sure we remove them from |
| 45 // any waiting lists first. | 44 // any waiting lists first. |
| 46 | 45 |
| 47 clearRenderer(); | 46 clearRenderer(); |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 ImplicitAnimation* anim = it->value.get(); | 520 ImplicitAnimation* anim = it->value.get(); |
| 522 if (anim->running()) | 521 if (anim->running()) |
| 523 ++count; | 522 ++count; |
| 524 } | 523 } |
| 525 } | 524 } |
| 526 | 525 |
| 527 return count; | 526 return count; |
| 528 } | 527 } |
| 529 | 528 |
| 530 } // namespace WebCore | 529 } // namespace WebCore |
| OLD | NEW |