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

Side by Side Diff: third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h

Issue 2726923005: Clear started transitions overwritten by duration 0 transitions on the same property (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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CSSAnimationUpdate_h 5 #ifndef CSSAnimationUpdate_h
6 #define CSSAnimationUpdate_h 6 #define CSSAnimationUpdate_h
7 7
8 #include "core/animation/EffectStack.h" 8 #include "core/animation/EffectStack.h"
9 #include "core/animation/InertEffect.h" 9 #include "core/animation/InertEffect.h"
10 #include "core/animation/Interpolation.h" 10 #include "core/animation/Interpolation.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 const InertEffect& effect) { 170 const InertEffect& effect) {
171 NewTransition newTransition; 171 NewTransition newTransition;
172 newTransition.id = id; 172 newTransition.id = id;
173 newTransition.from = std::move(from); 173 newTransition.from = std::move(from);
174 newTransition.to = std::move(to); 174 newTransition.to = std::move(to);
175 newTransition.reversingAdjustedStartValue = reversingAdjustedStartValue; 175 newTransition.reversingAdjustedStartValue = reversingAdjustedStartValue;
176 newTransition.reversingShorteningFactor = reversingShorteningFactor; 176 newTransition.reversingShorteningFactor = reversingShorteningFactor;
177 newTransition.effect = &effect; 177 newTransition.effect = &effect;
178 m_newTransitions.set(id, newTransition); 178 m_newTransitions.set(id, newTransition);
179 } 179 }
180 void unstartTransition(CSSPropertyID id) { m_newTransitions.remove(id); }
180 bool isCancelledTransition(CSSPropertyID id) const { 181 bool isCancelledTransition(CSSPropertyID id) const {
181 return m_cancelledTransitions.contains(id); 182 return m_cancelledTransitions.contains(id);
182 } 183 }
183 void cancelTransition(CSSPropertyID id) { m_cancelledTransitions.insert(id); } 184 void cancelTransition(CSSPropertyID id) { m_cancelledTransitions.insert(id); }
184 void finishTransition(CSSPropertyID id) { m_finishedTransitions.insert(id); } 185 void finishTransition(CSSPropertyID id) { m_finishedTransitions.insert(id); }
185 186
186 const HeapVector<NewCSSAnimation>& newAnimations() const { 187 const HeapVector<NewCSSAnimation>& newAnimations() const {
187 return m_newAnimations; 188 return m_newAnimations;
188 } 189 }
189 const Vector<size_t>& cancelledAnimationIndices() const { 190 const Vector<size_t>& cancelledAnimationIndices() const {
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 280
280 ActiveInterpolationsMap m_activeInterpolationsForAnimations; 281 ActiveInterpolationsMap m_activeInterpolationsForAnimations;
281 ActiveInterpolationsMap m_activeInterpolationsForTransitions; 282 ActiveInterpolationsMap m_activeInterpolationsForTransitions;
282 283
283 friend class PendingAnimationUpdate; 284 friend class PendingAnimationUpdate;
284 }; 285 };
285 286
286 } // namespace blink 287 } // namespace blink
287 288
288 #endif 289 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698