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

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

Issue 1433623002: Devtools Animations: Don't wait for empty transitions to start (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 1 month 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 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 887
888 if (playStateInternal() == Idle) 888 if (playStateInternal() == Idle)
889 return; 889 return;
890 890
891 m_holdTime = currentTimeInternal(); 891 m_holdTime = currentTimeInternal();
892 m_held = true; 892 m_held = true;
893 // TODO 893 // TODO
894 m_playState = Idle; 894 m_playState = Idle;
895 m_startTime = nullValue(); 895 m_startTime = nullValue();
896 m_currentTimePending = false; 896 m_currentTimePending = false;
897
898 InspectorInstrumentation::didCancelAnimation(m_timeline->document(), m_seque nceNumber);
897 } 899 }
898 900
899 void Animation::beginUpdatingState() 901 void Animation::beginUpdatingState()
900 { 902 {
901 // Nested calls are not allowed! 903 // Nested calls are not allowed!
902 ASSERT(!m_stateIsBeingUpdated); 904 ASSERT(!m_stateIsBeingUpdated);
903 m_stateIsBeingUpdated = true; 905 m_stateIsBeingUpdated = true;
904 } 906 }
905 907
906 void Animation::endUpdatingState() 908 void Animation::endUpdatingState()
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1087 visitor->trace(m_content); 1089 visitor->trace(m_content);
1088 visitor->trace(m_timeline); 1090 visitor->trace(m_timeline);
1089 visitor->trace(m_pendingFinishedEvent); 1091 visitor->trace(m_pendingFinishedEvent);
1090 visitor->trace(m_finishedPromise); 1092 visitor->trace(m_finishedPromise);
1091 visitor->trace(m_readyPromise); 1093 visitor->trace(m_readyPromise);
1092 RefCountedGarbageCollectedEventTargetWithInlineData<Animation>::trace(visito r); 1094 RefCountedGarbageCollectedEventTargetWithInlineData<Animation>::trace(visito r);
1093 ActiveDOMObject::trace(visitor); 1095 ActiveDOMObject::trace(visitor);
1094 } 1096 }
1095 1097
1096 } // namespace 1098 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698