| 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 21 matching lines...) Expand all Loading... |
| 32 #include "CSSPropertyAnimation.h" | 32 #include "CSSPropertyAnimation.h" |
| 33 #include "CompositeAnimation.h" | 33 #include "CompositeAnimation.h" |
| 34 #include "EventNames.h" | 34 #include "EventNames.h" |
| 35 #include "ImplicitAnimation.h" | 35 #include "ImplicitAnimation.h" |
| 36 #include "KeyframeAnimation.h" | 36 #include "KeyframeAnimation.h" |
| 37 #include "RenderBoxModelObject.h" | 37 #include "RenderBoxModelObject.h" |
| 38 #include <wtf/UnusedParam.h> | 38 #include <wtf/UnusedParam.h> |
| 39 | 39 |
| 40 namespace WebCore { | 40 namespace WebCore { |
| 41 | 41 |
| 42 ImplicitAnimation::ImplicitAnimation(const Animation* transition, CSSPropertyID
animatingProperty, RenderObject* renderer, CompositeAnimation* compAnim, RenderS
tyle* fromStyle) | 42 ImplicitAnimation::ImplicitAnimation(const PrimitiveAnimation* transition, CSSPr
opertyID animatingProperty, RenderObject* renderer, CompositeAnimation* compAnim
, RenderStyle* fromStyle) |
| 43 : AnimationBase(transition, renderer, compAnim) | 43 : AnimationBase(transition, renderer, compAnim) |
| 44 , m_transitionProperty(transition->property()) | 44 , m_transitionProperty(transition->property()) |
| 45 , m_animatingProperty(animatingProperty) | 45 , m_animatingProperty(animatingProperty) |
| 46 , m_overridden(false) | 46 , m_overridden(false) |
| 47 , m_active(true) | 47 , m_active(true) |
| 48 , m_fromStyle(fromStyle) | 48 , m_fromStyle(fromStyle) |
| 49 { | 49 { |
| 50 ASSERT(animatingProperty != CSSPropertyInvalid); | 50 ASSERT(animatingProperty != CSSPropertyInvalid); |
| 51 } | 51 } |
| 52 | 52 |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 // only need service at the end of the transition. | 281 // only need service at the end of the transition. |
| 282 if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(m_animatingProper
ty) && isAccelerated()) { | 282 if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(m_animatingProper
ty) && isAccelerated()) { |
| 283 bool isLooping; | 283 bool isLooping; |
| 284 getTimeToNextEvent(t, isLooping); | 284 getTimeToNextEvent(t, isLooping); |
| 285 } | 285 } |
| 286 | 286 |
| 287 return t; | 287 return t; |
| 288 } | 288 } |
| 289 | 289 |
| 290 } // namespace WebCore | 290 } // namespace WebCore |
| OLD | NEW |