| 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 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 633 } | 633 } |
| 634 | 634 |
| 635 void Animation::stop() | 635 void Animation::stop() |
| 636 { | 636 { |
| 637 PlayStateUpdateScope updateScope(*this, TimingUpdateOnDemand); | 637 PlayStateUpdateScope updateScope(*this, TimingUpdateOnDemand); |
| 638 | 638 |
| 639 m_finished = true; | 639 m_finished = true; |
| 640 m_pendingFinishedEvent = nullptr; | 640 m_pendingFinishedEvent = nullptr; |
| 641 } | 641 } |
| 642 | 642 |
| 643 bool Animation::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event) | 643 bool Animation::dispatchEventInternal(RawPtr<Event> event) |
| 644 { | 644 { |
| 645 if (m_pendingFinishedEvent == event) | 645 if (m_pendingFinishedEvent == event) |
| 646 m_pendingFinishedEvent = nullptr; | 646 m_pendingFinishedEvent = nullptr; |
| 647 return EventTargetWithInlineData::dispatchEventInternal(event); | 647 return EventTargetWithInlineData::dispatchEventInternal(event); |
| 648 } | 648 } |
| 649 | 649 |
| 650 double Animation::playbackRate() const | 650 double Animation::playbackRate() const |
| 651 { | 651 { |
| 652 return m_playbackRate; | 652 return m_playbackRate; |
| 653 } | 653 } |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1060 default: | 1060 default: |
| 1061 ASSERT_NOT_REACHED(); | 1061 ASSERT_NOT_REACHED(); |
| 1062 break; | 1062 break; |
| 1063 } | 1063 } |
| 1064 m_animation->endUpdatingState(); | 1064 m_animation->endUpdatingState(); |
| 1065 | 1065 |
| 1066 if (oldPlayState != newPlayState) | 1066 if (oldPlayState != newPlayState) |
| 1067 InspectorInstrumentation::animationPlayStateChanged(m_animation->timelin
e()->document(), m_animation, oldPlayState, newPlayState); | 1067 InspectorInstrumentation::animationPlayStateChanged(m_animation->timelin
e()->document(), m_animation, oldPlayState, newPlayState); |
| 1068 } | 1068 } |
| 1069 | 1069 |
| 1070 bool Animation::addEventListenerInternal(const AtomicString& eventType, PassRefP
trWillBeRawPtr<EventListener> listener, const EventListenerOptions& options) | 1070 bool Animation::addEventListenerInternal(const AtomicString& eventType, RawPtr<E
ventListener> listener, const EventListenerOptions& options) |
| 1071 { | 1071 { |
| 1072 if (eventType == EventTypeNames::finish) | 1072 if (eventType == EventTypeNames::finish) |
| 1073 UseCounter::count(executionContext(), UseCounter::AnimationFinishEvent); | 1073 UseCounter::count(executionContext(), UseCounter::AnimationFinishEvent); |
| 1074 return EventTargetWithInlineData::addEventListenerInternal(eventType, listen
er, options); | 1074 return EventTargetWithInlineData::addEventListenerInternal(eventType, listen
er, options); |
| 1075 } | 1075 } |
| 1076 | 1076 |
| 1077 void Animation::pauseForTesting(double pauseTime) | 1077 void Animation::pauseForTesting(double pauseTime) |
| 1078 { | 1078 { |
| 1079 RELEASE_ASSERT(!paused()); | 1079 RELEASE_ASSERT(!paused()); |
| 1080 setCurrentTimeInternal(pauseTime, TimingUpdateOnDemand); | 1080 setCurrentTimeInternal(pauseTime, TimingUpdateOnDemand); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 1095 visitor->trace(m_content); | 1095 visitor->trace(m_content); |
| 1096 visitor->trace(m_timeline); | 1096 visitor->trace(m_timeline); |
| 1097 visitor->trace(m_pendingFinishedEvent); | 1097 visitor->trace(m_pendingFinishedEvent); |
| 1098 visitor->trace(m_finishedPromise); | 1098 visitor->trace(m_finishedPromise); |
| 1099 visitor->trace(m_readyPromise); | 1099 visitor->trace(m_readyPromise); |
| 1100 RefCountedGarbageCollectedEventTargetWithInlineData<Animation>::trace(visito
r); | 1100 RefCountedGarbageCollectedEventTargetWithInlineData<Animation>::trace(visito
r); |
| 1101 ActiveDOMObject::trace(visitor); | 1101 ActiveDOMObject::trace(visitor); |
| 1102 } | 1102 } |
| 1103 | 1103 |
| 1104 } // namespace blink | 1104 } // namespace blink |
| OLD | NEW |