| 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 17 matching lines...) Expand all  Loading... | 
| 28 | 28 | 
| 29 #include "config.h" | 29 #include "config.h" | 
| 30 | 30 | 
| 31 #include "core/dom/EventNames.h" | 31 #include "core/dom/EventNames.h" | 
| 32 #include "core/page/animation/AnimationControllerPrivate.h" | 32 #include "core/page/animation/AnimationControllerPrivate.h" | 
| 33 #include "core/page/animation/CSSPropertyAnimation.h" | 33 #include "core/page/animation/CSSPropertyAnimation.h" | 
| 34 #include "core/page/animation/CompositeAnimation.h" | 34 #include "core/page/animation/CompositeAnimation.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/RenderBoxModelObject.h" | 37 #include "core/rendering/RenderBoxModelObject.h" | 
| 38 #include <wtf/UnusedParam.h> |  | 
| 39 | 38 | 
| 40 namespace WebCore { | 39 namespace WebCore { | 
| 41 | 40 | 
| 42 ImplicitAnimation::ImplicitAnimation(const CSSAnimationData* transition, CSSProp
     ertyID animatingProperty, RenderObject* renderer, CompositeAnimation* compAnim, 
     RenderStyle* fromStyle) | 41 ImplicitAnimation::ImplicitAnimation(const CSSAnimationData* transition, CSSProp
     ertyID animatingProperty, RenderObject* renderer, CompositeAnimation* compAnim, 
     RenderStyle* fromStyle) | 
| 43     : AnimationBase(transition, renderer, compAnim) | 42     : AnimationBase(transition, renderer, compAnim) | 
| 44     , m_transitionProperty(transition->property()) | 43     , m_transitionProperty(transition->property()) | 
| 45     , m_animatingProperty(animatingProperty) | 44     , m_animatingProperty(animatingProperty) | 
| 46     , m_overridden(false) | 45     , m_overridden(false) | 
| 47     , m_active(true) | 46     , m_active(true) | 
| 48     , m_fromStyle(fromStyle) | 47     , m_fromStyle(fromStyle) | 
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 280     // only need service at the end of the transition. | 279     // only need service at the end of the transition. | 
| 281     if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(m_animatingProper
     ty) && isAccelerated()) { | 280     if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(m_animatingProper
     ty) && isAccelerated()) { | 
| 282         bool isLooping; | 281         bool isLooping; | 
| 283         getTimeToNextEvent(t, isLooping); | 282         getTimeToNextEvent(t, isLooping); | 
| 284     } | 283     } | 
| 285 | 284 | 
| 286     return t; | 285     return t; | 
| 287 } | 286 } | 
| 288 | 287 | 
| 289 } // namespace WebCore | 288 } // namespace WebCore | 
| OLD | NEW | 
|---|