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 12 matching lines...) Expand all Loading... |
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 <algorithm> | 32 #include <algorithm> |
33 #include "Document.h" | |
34 #include "EventNames.h" | |
35 #include "core/css/CSSPrimitiveValue.h" | 33 #include "core/css/CSSPrimitiveValue.h" |
| 34 #include "core/dom/Document.h" |
| 35 #include "core/dom/EventNames.h" |
36 #include "core/page/animation/AnimationControllerPrivate.h" | 36 #include "core/page/animation/AnimationControllerPrivate.h" |
37 #include "core/page/animation/CSSPropertyAnimation.h" | 37 #include "core/page/animation/CSSPropertyAnimation.h" |
38 #include "core/page/animation/CompositeAnimation.h" | 38 #include "core/page/animation/CompositeAnimation.h" |
39 #include "core/platform/FloatConversion.h" | 39 #include "core/platform/FloatConversion.h" |
40 #include "core/platform/graphics/UnitBezier.h" | 40 #include "core/platform/graphics/UnitBezier.h" |
41 #include "core/rendering/RenderBox.h" | 41 #include "core/rendering/RenderBox.h" |
42 #include "core/rendering/style/RenderStyle.h" | 42 #include "core/rendering/style/RenderStyle.h" |
43 #include <wtf/CurrentTime.h> | 43 #include <wtf/CurrentTime.h> |
44 | 44 |
45 using namespace std; | 45 using namespace std; |
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
611 return m_pauseTime - m_startTime; | 611 return m_pauseTime - m_startTime; |
612 if (m_startTime <= 0) | 612 if (m_startTime <= 0) |
613 return 0; | 613 return 0; |
614 if (postActive()) | 614 if (postActive()) |
615 return 1; | 615 return 1; |
616 | 616 |
617 return beginAnimationUpdateTime() - m_startTime; | 617 return beginAnimationUpdateTime() - m_startTime; |
618 } | 618 } |
619 | 619 |
620 } // namespace WebCore | 620 } // namespace WebCore |
OLD | NEW |