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

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

Issue 2724313002: Split transitions update storage between custom and standard properties (Closed)
Patch Set: Created 3 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
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 931 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 KeyframeEffectReadOnly::TransitionPriority, isStylePropertyHandle); 942 KeyframeEffectReadOnly::TransitionPriority, isStylePropertyHandle);
943 } 943 }
944 944
945 // Properties being animated by animations don't get values from transitions 945 // Properties being animated by animations don't get values from transitions
946 // applied. 946 // applied.
947 if (!update.activeInterpolationsForAnimations().isEmpty() && 947 if (!update.activeInterpolationsForAnimations().isEmpty() &&
948 !activeInterpolationsForTransitions.isEmpty()) { 948 !activeInterpolationsForTransitions.isEmpty()) {
949 for (const auto& entry : update.activeInterpolationsForAnimations()) 949 for (const auto& entry : update.activeInterpolationsForAnimations())
950 activeInterpolationsForTransitions.erase(entry.key); 950 activeInterpolationsForTransitions.erase(entry.key);
951 } 951 }
952 update.adoptActiveInterpolationsForTransitions( 952 update.adoptActiveInterpolationsForStandardTransitions(
953 activeInterpolationsForTransitions); 953 activeInterpolationsForTransitions);
954 } 954 }
955 955
956 EventTarget* CSSAnimations::AnimationEventDelegate::eventTarget() const { 956 EventTarget* CSSAnimations::AnimationEventDelegate::eventTarget() const {
957 return EventPath::eventTargetRespectingTargetRules(*m_animationTarget); 957 return EventPath::eventTargetRespectingTargetRules(*m_animationTarget);
958 } 958 }
959 959
960 void CSSAnimations::AnimationEventDelegate::maybeDispatch( 960 void CSSAnimations::AnimationEventDelegate::maybeDispatch(
961 Document::ListenerType listenerType, 961 Document::ListenerType listenerType,
962 const AtomicString& eventName, 962 const AtomicString& eventName,
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1124 isCustomPropertyHandle); 1124 isCustomPropertyHandle);
1125 } 1125 }
1126 1126
1127 DEFINE_TRACE(CSSAnimations) { 1127 DEFINE_TRACE(CSSAnimations) {
1128 visitor->trace(m_transitions); 1128 visitor->trace(m_transitions);
1129 visitor->trace(m_pendingUpdate); 1129 visitor->trace(m_pendingUpdate);
1130 visitor->trace(m_runningAnimations); 1130 visitor->trace(m_runningAnimations);
1131 } 1131 }
1132 1132
1133 } // namespace blink 1133 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698