| 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 28 matching lines...) Expand all Loading... |
| 39 #include "core/animation/LegacyStyleInterpolation.h" | 39 #include "core/animation/LegacyStyleInterpolation.h" |
| 40 #include "core/animation/css/CSSAnimatableValueFactory.h" | 40 #include "core/animation/css/CSSAnimatableValueFactory.h" |
| 41 #include "core/animation/css/CSSPropertyEquality.h" | 41 #include "core/animation/css/CSSPropertyEquality.h" |
| 42 #include "core/css/CSSKeyframeRule.h" | 42 #include "core/css/CSSKeyframeRule.h" |
| 43 #include "core/css/CSSPropertyMetadata.h" | 43 #include "core/css/CSSPropertyMetadata.h" |
| 44 #include "core/css/CSSValueList.h" | 44 #include "core/css/CSSValueList.h" |
| 45 #include "core/css/resolver/CSSToStyleMap.h" | 45 #include "core/css/resolver/CSSToStyleMap.h" |
| 46 #include "core/css/resolver/StyleResolver.h" | 46 #include "core/css/resolver/StyleResolver.h" |
| 47 #include "core/dom/Element.h" | 47 #include "core/dom/Element.h" |
| 48 #include "core/dom/StyleEngine.h" | 48 #include "core/dom/StyleEngine.h" |
| 49 #include "core/events/AnimationEvent.h" |
| 49 #include "core/events/TransitionEvent.h" | 50 #include "core/events/TransitionEvent.h" |
| 50 #include "core/events/WebKitAnimationEvent.h" | |
| 51 #include "core/frame/UseCounter.h" | 51 #include "core/frame/UseCounter.h" |
| 52 #include "core/rendering/RenderLayer.h" | 52 #include "core/rendering/RenderLayer.h" |
| 53 #include "core/rendering/RenderObject.h" | 53 #include "core/rendering/RenderObject.h" |
| 54 #include "core/rendering/style/KeyframeList.h" | 54 #include "core/rendering/style/KeyframeList.h" |
| 55 #include "platform/animation/TimingFunction.h" | 55 #include "platform/animation/TimingFunction.h" |
| 56 #include "public/platform/Platform.h" | 56 #include "public/platform/Platform.h" |
| 57 #include "wtf/BitArray.h" | 57 #include "wtf/BitArray.h" |
| 58 #include "wtf/HashSet.h" | 58 #include "wtf/HashSet.h" |
| 59 | 59 |
| 60 namespace blink { | 60 namespace blink { |
| (...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 578 if (!update->activeInterpolationsForAnimations().isEmpty() && !activeInterpo
lationsForTransitions.isEmpty()) { | 578 if (!update->activeInterpolationsForAnimations().isEmpty() && !activeInterpo
lationsForTransitions.isEmpty()) { |
| 579 for (WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>
>::const_iterator iter = update->activeInterpolationsForAnimations().begin(); it
er != update->activeInterpolationsForAnimations().end(); ++iter) | 579 for (WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>
>::const_iterator iter = update->activeInterpolationsForAnimations().begin(); it
er != update->activeInterpolationsForAnimations().end(); ++iter) |
| 580 activeInterpolationsForTransitions.remove(iter->key); | 580 activeInterpolationsForTransitions.remove(iter->key); |
| 581 } | 581 } |
| 582 update->adoptActiveInterpolationsForTransitions(activeInterpolationsForTrans
itions); | 582 update->adoptActiveInterpolationsForTransitions(activeInterpolationsForTrans
itions); |
| 583 } | 583 } |
| 584 | 584 |
| 585 void CSSAnimations::AnimationEventDelegate::maybeDispatch(Document::ListenerType
listenerType, const AtomicString& eventName, double elapsedTime) | 585 void CSSAnimations::AnimationEventDelegate::maybeDispatch(Document::ListenerType
listenerType, const AtomicString& eventName, double elapsedTime) |
| 586 { | 586 { |
| 587 if (m_target->document().hasListenerType(listenerType)) { | 587 if (m_target->document().hasListenerType(listenerType)) { |
| 588 RefPtrWillBeRawPtr<WebKitAnimationEvent> event = WebKitAnimationEvent::c
reate(eventName, m_name, elapsedTime); | 588 RefPtrWillBeRawPtr<AnimationEvent> event = AnimationEvent::create(eventN
ame, m_name, elapsedTime); |
| 589 event->setTarget(m_target); | 589 event->setTarget(m_target); |
| 590 m_target->document().enqueueAnimationFrameEvent(event); | 590 m_target->document().enqueueAnimationFrameEvent(event); |
| 591 } | 591 } |
| 592 } | 592 } |
| 593 | 593 |
| 594 void CSSAnimations::AnimationEventDelegate::onEventCondition(const AnimationNode
* animationNode) | 594 void CSSAnimations::AnimationEventDelegate::onEventCondition(const AnimationNode
* animationNode) |
| 595 { | 595 { |
| 596 const AnimationNode::Phase currentPhase = animationNode->phase(); | 596 const AnimationNode::Phase currentPhase = animationNode->phase(); |
| 597 const double currentIteration = animationNode->currentIteration(); | 597 const double currentIteration = animationNode->currentIteration(); |
| 598 | 598 |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 #if ENABLE(OILPAN) | 720 #if ENABLE(OILPAN) |
| 721 visitor->trace(m_newTransitions); | 721 visitor->trace(m_newTransitions); |
| 722 visitor->trace(m_activeInterpolationsForAnimations); | 722 visitor->trace(m_activeInterpolationsForAnimations); |
| 723 visitor->trace(m_activeInterpolationsForTransitions); | 723 visitor->trace(m_activeInterpolationsForTransitions); |
| 724 visitor->trace(m_newAnimations); | 724 visitor->trace(m_newAnimations); |
| 725 visitor->trace(m_cancelledAnimationPlayers); | 725 visitor->trace(m_cancelledAnimationPlayers); |
| 726 #endif | 726 #endif |
| 727 } | 727 } |
| 728 | 728 |
| 729 } // namespace blink | 729 } // namespace blink |
| OLD | NEW |