| 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 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 650 } | 650 } |
| 651 | 651 |
| 652 void Animation::stop() | 652 void Animation::stop() |
| 653 { | 653 { |
| 654 PlayStateUpdateScope updateScope(*this, TimingUpdateOnDemand); | 654 PlayStateUpdateScope updateScope(*this, TimingUpdateOnDemand); |
| 655 | 655 |
| 656 m_finished = true; | 656 m_finished = true; |
| 657 m_pendingFinishedEvent = nullptr; | 657 m_pendingFinishedEvent = nullptr; |
| 658 } | 658 } |
| 659 | 659 |
| 660 DispatchEventResult Animation::dispatchEventInternal(PassRefPtrWillBeRawPtr<Even
t> event) | 660 DispatchEventResult Animation::dispatchEventInternal(RawPtr<Event> event) |
| 661 { | 661 { |
| 662 if (m_pendingFinishedEvent == event) | 662 if (m_pendingFinishedEvent == event) |
| 663 m_pendingFinishedEvent = nullptr; | 663 m_pendingFinishedEvent = nullptr; |
| 664 return EventTargetWithInlineData::dispatchEventInternal(event); | 664 return EventTargetWithInlineData::dispatchEventInternal(event); |
| 665 } | 665 } |
| 666 | 666 |
| 667 double Animation::playbackRate() const | 667 double Animation::playbackRate() const |
| 668 { | 668 { |
| 669 return m_playbackRate; | 669 return m_playbackRate; |
| 670 } | 670 } |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1046 default: | 1046 default: |
| 1047 ASSERT_NOT_REACHED(); | 1047 ASSERT_NOT_REACHED(); |
| 1048 break; | 1048 break; |
| 1049 } | 1049 } |
| 1050 m_animation->endUpdatingState(); | 1050 m_animation->endUpdatingState(); |
| 1051 | 1051 |
| 1052 if (oldPlayState != newPlayState) | 1052 if (oldPlayState != newPlayState) |
| 1053 InspectorInstrumentation::animationPlayStateChanged(m_animation->timelin
e()->document(), m_animation, oldPlayState, newPlayState); | 1053 InspectorInstrumentation::animationPlayStateChanged(m_animation->timelin
e()->document(), m_animation, oldPlayState, newPlayState); |
| 1054 } | 1054 } |
| 1055 | 1055 |
| 1056 bool Animation::addEventListenerInternal(const AtomicString& eventType, PassRefP
trWillBeRawPtr<EventListener> listener, const EventListenerOptions& options) | 1056 bool Animation::addEventListenerInternal(const AtomicString& eventType, RawPtr<E
ventListener> listener, const EventListenerOptions& options) |
| 1057 { | 1057 { |
| 1058 if (eventType == EventTypeNames::finish) | 1058 if (eventType == EventTypeNames::finish) |
| 1059 UseCounter::count(getExecutionContext(), UseCounter::AnimationFinishEven
t); | 1059 UseCounter::count(getExecutionContext(), UseCounter::AnimationFinishEven
t); |
| 1060 return EventTargetWithInlineData::addEventListenerInternal(eventType, listen
er, options); | 1060 return EventTargetWithInlineData::addEventListenerInternal(eventType, listen
er, options); |
| 1061 } | 1061 } |
| 1062 | 1062 |
| 1063 void Animation::pauseForTesting(double pauseTime) | 1063 void Animation::pauseForTesting(double pauseTime) |
| 1064 { | 1064 { |
| 1065 RELEASE_ASSERT(!paused()); | 1065 RELEASE_ASSERT(!paused()); |
| 1066 setCurrentTimeInternal(pauseTime, TimingUpdateOnDemand); | 1066 setCurrentTimeInternal(pauseTime, TimingUpdateOnDemand); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 1082 visitor->trace(m_timeline); | 1082 visitor->trace(m_timeline); |
| 1083 visitor->trace(m_pendingFinishedEvent); | 1083 visitor->trace(m_pendingFinishedEvent); |
| 1084 visitor->trace(m_pendingCancelledEvent); | 1084 visitor->trace(m_pendingCancelledEvent); |
| 1085 visitor->trace(m_finishedPromise); | 1085 visitor->trace(m_finishedPromise); |
| 1086 visitor->trace(m_readyPromise); | 1086 visitor->trace(m_readyPromise); |
| 1087 RefCountedGarbageCollectedEventTargetWithInlineData<Animation>::trace(visito
r); | 1087 RefCountedGarbageCollectedEventTargetWithInlineData<Animation>::trace(visito
r); |
| 1088 ActiveDOMObject::trace(visitor); | 1088 ActiveDOMObject::trace(visitor); |
| 1089 } | 1089 } |
| 1090 | 1090 |
| 1091 } // namespace blink | 1091 } // namespace blink |
| OLD | NEW |