| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. | 2  * Copyright (C) 2007, 2008, 2009 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 11 matching lines...) Expand all  Loading... | 
| 22  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 22  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 
| 23  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 23  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 
| 24  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
| 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/page/animation/AnimationBase.h" | 30 #include "core/page/animation/AnimationBase.h" | 
| 31 | 31 | 
| 32 #include "core/css/CSSPrimitiveValue.h" |  | 
| 33 #include "core/dom/Document.h" |  | 
| 34 #include "core/dom/EventNames.h" |  | 
| 35 #include "core/page/animation/AnimationControllerPrivate.h" | 32 #include "core/page/animation/AnimationControllerPrivate.h" | 
| 36 #include "core/page/animation/CSSPropertyAnimation.h" |  | 
| 37 #include "core/page/animation/CompositeAnimation.h" | 33 #include "core/page/animation/CompositeAnimation.h" | 
| 38 #include "core/platform/FloatConversion.h" |  | 
| 39 #include "core/platform/animation/AnimationUtilities.h" | 34 #include "core/platform/animation/AnimationUtilities.h" | 
| 40 #include "core/platform/animation/TimingFunction.h" | 35 #include "core/platform/animation/TimingFunction.h" | 
| 41 #include "core/rendering/RenderBox.h" | 36 #include "core/rendering/RenderBox.h" | 
| 42 #include "core/rendering/style/RenderStyle.h" |  | 
| 43 #include "wtf/CurrentTime.h" |  | 
| 44 #include <algorithm> | 37 #include <algorithm> | 
| 45 | 38 | 
| 46 using namespace std; | 39 using namespace std; | 
| 47 | 40 | 
| 48 namespace WebCore { | 41 namespace WebCore { | 
| 49 | 42 | 
| 50 AnimationBase::AnimationBase(const CSSAnimationData* transition, RenderObject* r
     enderer, CompositeAnimation* compAnim) | 43 AnimationBase::AnimationBase(const CSSAnimationData* transition, RenderObject* r
     enderer, CompositeAnimation* compAnim) | 
| 51     : m_animState(AnimationStateNew) | 44     : m_animState(AnimationStateNew) | 
| 52     , m_isAccelerated(false) | 45     , m_isAccelerated(false) | 
| 53     , m_transformFunctionListValid(false) | 46     , m_transformFunctionListValid(false) | 
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 580     ASSERT(!postActive()); | 573     ASSERT(!postActive()); | 
| 581     if (paused()) | 574     if (paused()) | 
| 582         return m_pauseTime - m_startTime; | 575         return m_pauseTime - m_startTime; | 
| 583     if (m_startTime <= 0) | 576     if (m_startTime <= 0) | 
| 584         return 0; | 577         return 0; | 
| 585 | 578 | 
| 586     return beginAnimationUpdateTime() - m_startTime; | 579     return beginAnimationUpdateTime() - m_startTime; | 
| 587 } | 580 } | 
| 588 | 581 | 
| 589 } // namespace WebCore | 582 } // namespace WebCore | 
| OLD | NEW | 
|---|