| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 RefPtr<Animation> oldAnimation = oldTransition.first; | 431 RefPtr<Animation> oldAnimation = oldTransition.first; |
| 432 double oldStartTime = oldTransition.second; | 432 double oldStartTime = oldTransition.second; |
| 433 double inheritedTime = isNull(oldStartTime) ? 0 : element->document(
).transitionTimeline().currentTime() - oldStartTime; | 433 double inheritedTime = isNull(oldStartTime) ? 0 : element->document(
).transitionTimeline().currentTime() - oldStartTime; |
| 434 oldAnimation->updateInheritedTime(inheritedTime); | 434 oldAnimation->updateInheritedTime(inheritedTime); |
| 435 AnimatableValueKeyframeEffectModel* oldEffect = toAnimatableValueKey
frameEffectModel(inertAnimation->effect()); | 435 AnimatableValueKeyframeEffectModel* oldEffect = toAnimatableValueKey
frameEffectModel(inertAnimation->effect()); |
| 436 const KeyframeVector& frames = oldEffect->getFrames(); | 436 const KeyframeVector& frames = oldEffect->getFrames(); |
| 437 AnimatableValueKeyframeVector newFrames; | 437 AnimatableValueKeyframeVector newFrames; |
| 438 newFrames.append(toAnimatableValueKeyframe(frames[0]->clone().get())
); | 438 newFrames.append(toAnimatableValueKeyframe(frames[0]->clone().get())
); |
| 439 newFrames[0]->clearPropertyValue(id); | 439 newFrames[0]->clearPropertyValue(id); |
| 440 ASSERT(oldAnimation->activeInterpolations().size() == 1); | 440 ASSERT(oldAnimation->activeInterpolations().size() == 1); |
| 441 RefPtr<AnimatableValue> value = toLegacyStyleInterpolation(oldAnimat
ion->activeInterpolations()[0].get())->currentValue(); | 441 RefPtrWillBeRawPtr<AnimatableValue> value = toLegacyStyleInterpolati
on(oldAnimation->activeInterpolations()[0].get())->currentValue(); |
| 442 newFrames[0]->setPropertyValue(id, value.release()); | 442 newFrames[0]->setPropertyValue(id, value.release()); |
| 443 newFrames.append(toAnimatableValueKeyframe(frames[1]->clone().get())
); | 443 newFrames.append(toAnimatableValueKeyframe(frames[1]->clone().get())
); |
| 444 effect = AnimatableValueKeyframeEffectModel::create(newFrames); | 444 effect = AnimatableValueKeyframeEffectModel::create(newFrames); |
| 445 } | 445 } |
| 446 RefPtr<Animation> transition = Animation::create(element, effect, inertA
nimation->specifiedTiming(), Animation::TransitionPriority, eventDelegate.releas
e()); | 446 RefPtr<Animation> transition = Animation::create(element, effect, inertA
nimation->specifiedTiming(), Animation::TransitionPriority, eventDelegate.releas
e()); |
| 447 RefPtr<AnimationPlayer> player = element->document().transitionTimeline(
).createAnimationPlayer(transition.get()); | 447 RefPtr<AnimationPlayer> player = element->document().transitionTimeline(
).createAnimationPlayer(transition.get()); |
| 448 player->update(); | 448 player->update(); |
| 449 element->document().cssPendingAnimations().add(player.get()); | 449 element->document().cssPendingAnimations().add(player.get()); |
| 450 runningTransition.transition = transition.get(); | 450 runningTransition.transition = transition.get(); |
| 451 m_transitions.set(id, runningTransition); | 451 m_transitions.set(id, runningTransition); |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 841 } | 841 } |
| 842 | 842 |
| 843 void CSSAnimationUpdate::trace(Visitor* visitor) | 843 void CSSAnimationUpdate::trace(Visitor* visitor) |
| 844 { | 844 { |
| 845 visitor->trace(m_newTransitions); | 845 visitor->trace(m_newTransitions); |
| 846 visitor->trace(m_activeInterpolationsForAnimations); | 846 visitor->trace(m_activeInterpolationsForAnimations); |
| 847 visitor->trace(m_activeInterpolationsForTransitions); | 847 visitor->trace(m_activeInterpolationsForTransitions); |
| 848 } | 848 } |
| 849 | 849 |
| 850 } // namespace WebCore | 850 } // namespace WebCore |
| OLD | NEW |