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

Side by Side Diff: Source/core/animation/AnimationPlayer.cpp

Issue 1030103002: Transitions: Downgrade transition to animation after it has finished (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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 | Annotate | Revision Log
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 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 if (playStateInternal() == Idle) 796 if (playStateInternal() == Idle)
797 return; 797 return;
798 798
799 m_holdTime = currentTimeInternal(); 799 m_holdTime = currentTimeInternal();
800 m_held = true; 800 m_held = true;
801 // TODO 801 // TODO
802 m_playState = Idle; 802 m_playState = Idle;
803 m_startTime = nullValue(); 803 m_startTime = nullValue();
804 m_currentTimePending = false; 804 m_currentTimePending = false;
805 805
806 // after cancelation, transitions must be downgraded or they'll fail
807 // to be considered when retriggering themselves. This can happen if
808 // the transition is captured through getAnimationPlayers then played.
809 if (m_content && m_content->isAnimation())
810 toAnimation(m_content.get())->downgradeToNormalAnimation();
811
812 InspectorInstrumentation::didCancelAnimationPlayer(timeline()->document(), t his); 806 InspectorInstrumentation::didCancelAnimationPlayer(timeline()->document(), t his);
813 } 807 }
814 808
815 void AnimationPlayer::beginUpdatingState() 809 void AnimationPlayer::beginUpdatingState()
816 { 810 {
817 // Nested calls are not allowed! 811 // Nested calls are not allowed!
818 ASSERT(!m_stateIsBeingUpdated); 812 ASSERT(!m_stateIsBeingUpdated);
819 m_stateIsBeingUpdated = true; 813 m_stateIsBeingUpdated = true;
820 } 814 }
821 815
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
931 visitor->trace(m_content); 925 visitor->trace(m_content);
932 visitor->trace(m_timeline); 926 visitor->trace(m_timeline);
933 visitor->trace(m_pendingFinishedEvent); 927 visitor->trace(m_pendingFinishedEvent);
934 visitor->trace(m_finishedPromise); 928 visitor->trace(m_finishedPromise);
935 visitor->trace(m_readyPromise); 929 visitor->trace(m_readyPromise);
936 EventTargetWithInlineData::trace(visitor); 930 EventTargetWithInlineData::trace(visitor);
937 ActiveDOMObject::trace(visitor); 931 ActiveDOMObject::trace(visitor);
938 } 932 }
939 933
940 } // namespace 934 } // namespace
OLDNEW
« no previous file with comments | « LayoutTests/web-animations-api/transitions-replay.html ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698