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

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

Issue 2673543003: Migrate WTF::HashMap::remove() to ::erase() (Closed)
Patch Set: Created 3 years, 10 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 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 activeInterpolationsForTransitions = EffectStack::activeInterpolations( 886 activeInterpolationsForTransitions = EffectStack::activeInterpolations(
887 effectStack, &newTransitions, &cancelledAnimations, 887 effectStack, &newTransitions, &cancelledAnimations,
888 KeyframeEffectReadOnly::TransitionPriority, isStylePropertyHandle); 888 KeyframeEffectReadOnly::TransitionPriority, isStylePropertyHandle);
889 } 889 }
890 890
891 // Properties being animated by animations don't get values from transitions 891 // Properties being animated by animations don't get values from transitions
892 // applied. 892 // applied.
893 if (!update.activeInterpolationsForAnimations().isEmpty() && 893 if (!update.activeInterpolationsForAnimations().isEmpty() &&
894 !activeInterpolationsForTransitions.isEmpty()) { 894 !activeInterpolationsForTransitions.isEmpty()) {
895 for (const auto& entry : update.activeInterpolationsForAnimations()) 895 for (const auto& entry : update.activeInterpolationsForAnimations())
896 activeInterpolationsForTransitions.remove(entry.key); 896 activeInterpolationsForTransitions.erase(entry.key);
897 } 897 }
898 update.adoptActiveInterpolationsForTransitions( 898 update.adoptActiveInterpolationsForTransitions(
899 activeInterpolationsForTransitions); 899 activeInterpolationsForTransitions);
900 } 900 }
901 901
902 EventTarget* CSSAnimations::AnimationEventDelegate::eventTarget() const { 902 EventTarget* CSSAnimations::AnimationEventDelegate::eventTarget() const {
903 return EventPath::eventTargetRespectingTargetRules(*m_animationTarget); 903 return EventPath::eventTargetRespectingTargetRules(*m_animationTarget);
904 } 904 }
905 905
906 void CSSAnimations::AnimationEventDelegate::maybeDispatch( 906 void CSSAnimations::AnimationEventDelegate::maybeDispatch(
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 isCustomPropertyHandle); 1068 isCustomPropertyHandle);
1069 } 1069 }
1070 1070
1071 DEFINE_TRACE(CSSAnimations) { 1071 DEFINE_TRACE(CSSAnimations) {
1072 visitor->trace(m_transitions); 1072 visitor->trace(m_transitions);
1073 visitor->trace(m_pendingUpdate); 1073 visitor->trace(m_pendingUpdate);
1074 visitor->trace(m_runningAnimations); 1074 visitor->trace(m_runningAnimations);
1075 } 1075 }
1076 1076
1077 } // namespace blink 1077 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698