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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 #if USE(ACCELERATED_COMPOSITING) | 144 #if USE(ACCELERATED_COMPOSITING) |
145 // For accelerated animations we need to return a new Re
nderStyle with the _current_ value | 145 // For accelerated animations we need to return a new Re
nderStyle with the _current_ value |
146 // of the property, so that restarted transitions use th
e correct starting point. | 146 // of the property, so that restarted transitions use th
e correct starting point. |
147 if (AnimationBase::animationOfPropertyIsAccelerated(prop
) && implAnim->isAccelerated()) { | 147 if (AnimationBase::animationOfPropertyIsAccelerated(prop
) && implAnim->isAccelerated()) { |
148 if (!modifiedCurrentStyle) | 148 if (!modifiedCurrentStyle) |
149 modifiedCurrentStyle = RenderStyle::clone(curren
tStyle); | 149 modifiedCurrentStyle = RenderStyle::clone(curren
tStyle); |
150 | 150 |
151 implAnim->blendPropertyValueInStyle(prop, modifiedCu
rrentStyle.get()); | 151 implAnim->blendPropertyValueInStyle(prop, modifiedCu
rrentStyle.get()); |
152 } | 152 } |
153 #endif | 153 #endif |
| 154 animationController()->animationWillBeRemoved(implAnim); |
154 m_transitions.remove(prop); | 155 m_transitions.remove(prop); |
155 equal = false; | 156 equal = false; |
156 } | 157 } |
157 } else { | 158 } else { |
158 // We need to start a transition if it is active and the pro
perties don't match | 159 // We need to start a transition if it is active and the pro
perties don't match |
159 equal = !isActiveTransition || AnimationBase::propertiesEqua
l(prop, fromStyle, targetStyle); | 160 equal = !isActiveTransition || AnimationBase::propertiesEqua
l(prop, fromStyle, targetStyle); |
160 } | 161 } |
161 | 162 |
162 // We can be in this loop with an inactive transition (!isActive
Transition). We need | 163 // We can be in this loop with an inactive transition (!isActive
Transition). We need |
163 // to do that to check to see if we are canceling a transition.
But we don't want to | 164 // to do that to check to see if we are canceling a transition.
But we don't want to |
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 if (keyframeAnimation) { | 583 if (keyframeAnimation) { |
583 RefPtr<WebKitAnimation> anim = WebKitAnimation::create(keyframeA
nimation); | 584 RefPtr<WebKitAnimation> anim = WebKitAnimation::create(keyframeA
nimation); |
584 animations->append(anim); | 585 animations->append(anim); |
585 } | 586 } |
586 } | 587 } |
587 } | 588 } |
588 return animations; | 589 return animations; |
589 } | 590 } |
590 | 591 |
591 } // namespace WebCore | 592 } // namespace WebCore |
OLD | NEW |