Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Side by Side Diff: third_party/WebKit/Source/core/animation/Animation.cpp

Issue 1942723004: Change EventTarget callback APIs for add/RemoveEventListenerInternal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix win32 signed/unsigned issue Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 default: 1042 default:
1043 ASSERT_NOT_REACHED(); 1043 ASSERT_NOT_REACHED();
1044 break; 1044 break;
1045 } 1045 }
1046 m_animation->endUpdatingState(); 1046 m_animation->endUpdatingState();
1047 1047
1048 if (oldPlayState != newPlayState) 1048 if (oldPlayState != newPlayState)
1049 InspectorInstrumentation::animationPlayStateChanged(m_animation->timelin e()->document(), m_animation, oldPlayState, newPlayState); 1049 InspectorInstrumentation::animationPlayStateChanged(m_animation->timelin e()->document(), m_animation, oldPlayState, newPlayState);
1050 } 1050 }
1051 1051
1052 bool Animation::addEventListenerInternal(const AtomicString& eventType, EventLis tener* listener, const EventListenerOptions& options) 1052 void Animation::addedEventListener(const AtomicString& eventType, RegisteredEven tListener& registeredListener)
1053 { 1053 {
1054 EventTargetWithInlineData::addedEventListener(eventType, registeredListener) ;
1054 if (eventType == EventTypeNames::finish) 1055 if (eventType == EventTypeNames::finish)
1055 UseCounter::count(getExecutionContext(), UseCounter::AnimationFinishEven t); 1056 UseCounter::count(getExecutionContext(), UseCounter::AnimationFinishEven t);
1056 return EventTargetWithInlineData::addEventListenerInternal(eventType, listen er, options);
1057 } 1057 }
1058 1058
1059 void Animation::pauseForTesting(double pauseTime) 1059 void Animation::pauseForTesting(double pauseTime)
1060 { 1060 {
1061 RELEASE_ASSERT(!paused()); 1061 RELEASE_ASSERT(!paused());
1062 setCurrentTimeInternal(pauseTime, TimingUpdateOnDemand); 1062 setCurrentTimeInternal(pauseTime, TimingUpdateOnDemand);
1063 if (hasActiveAnimationsOnCompositor()) 1063 if (hasActiveAnimationsOnCompositor())
1064 toKeyframeEffect(m_content.get())->pauseAnimationForTestingOnCompositor( currentTimeInternal()); 1064 toKeyframeEffect(m_content.get())->pauseAnimationForTestingOnCompositor( currentTimeInternal());
1065 m_isPausedForTesting = true; 1065 m_isPausedForTesting = true;
1066 pause(); 1066 pause();
(...skipping 18 matching lines...) Expand all
1085 visitor->trace(m_timeline); 1085 visitor->trace(m_timeline);
1086 visitor->trace(m_pendingFinishedEvent); 1086 visitor->trace(m_pendingFinishedEvent);
1087 visitor->trace(m_pendingCancelledEvent); 1087 visitor->trace(m_pendingCancelledEvent);
1088 visitor->trace(m_finishedPromise); 1088 visitor->trace(m_finishedPromise);
1089 visitor->trace(m_readyPromise); 1089 visitor->trace(m_readyPromise);
1090 EventTargetWithInlineData::trace(visitor); 1090 EventTargetWithInlineData::trace(visitor);
1091 ActiveDOMObject::trace(visitor); 1091 ActiveDOMObject::trace(visitor);
1092 } 1092 }
1093 1093
1094 } // namespace blink 1094 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/animation/Animation.h ('k') | third_party/WebKit/Source/core/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698