| OLD | NEW |
| 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/AnimationStack.h" | 8 #include "core/animation/AnimationStack.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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 CSSPropertyID id; | 237 CSSPropertyID id; |
| 238 const AnimatableValue* from; | 238 const AnimatableValue* from; |
| 239 const AnimatableValue* to; | 239 const AnimatableValue* to; |
| 240 Member<InertEffect> effect; | 240 Member<InertEffect> effect; |
| 241 }; | 241 }; |
| 242 using NewTransitionMap = HeapHashMap<CSSPropertyID, NewTransition>; | 242 using NewTransitionMap = HeapHashMap<CSSPropertyID, NewTransition>; |
| 243 const NewTransitionMap& newTransitions() const { return m_newTransitions; } | 243 const NewTransitionMap& newTransitions() const { return m_newTransitions; } |
| 244 const HashSet<CSSPropertyID>& cancelledTransitions() const { return m_cancel
ledTransitions; } | 244 const HashSet<CSSPropertyID>& cancelledTransitions() const { return m_cancel
ledTransitions; } |
| 245 const HashSet<CSSPropertyID>& finishedTransitions() const { return m_finishe
dTransitions; } | 245 const HashSet<CSSPropertyID>& finishedTransitions() const { return m_finishe
dTransitions; } |
| 246 | 246 |
| 247 void adoptActiveInterpolationsForAnimations(ActiveInterpolationMap& newMap)
{ newMap.swap(m_activeInterpolationsForAnimations); } | 247 void adoptActiveInterpolationsForAnimations(ActiveInterpolationsMap& newMap)
{ newMap.swap(m_activeInterpolationsForAnimations); } |
| 248 void adoptActiveInterpolationsForTransitions(ActiveInterpolationMap& newMap)
{ newMap.swap(m_activeInterpolationsForTransitions); } | 248 void adoptActiveInterpolationsForTransitions(ActiveInterpolationsMap& newMap
) { newMap.swap(m_activeInterpolationsForTransitions); } |
| 249 const ActiveInterpolationMap& activeInterpolationsForAnimations() const { re
turn m_activeInterpolationsForAnimations; } | 249 const ActiveInterpolationsMap& activeInterpolationsForAnimations() const { r
eturn m_activeInterpolationsForAnimations; } |
| 250 const ActiveInterpolationMap& activeInterpolationsForTransitions() const { r
eturn m_activeInterpolationsForTransitions; } | 250 const ActiveInterpolationsMap& activeInterpolationsForTransitions() const {
return m_activeInterpolationsForTransitions; } |
| 251 ActiveInterpolationMap& activeInterpolationsForAnimations() { return m_activ
eInterpolationsForAnimations; } | 251 ActiveInterpolationsMap& activeInterpolationsForAnimations() { return m_acti
veInterpolationsForAnimations; } |
| 252 | 252 |
| 253 bool isEmpty() const | 253 bool isEmpty() const |
| 254 { | 254 { |
| 255 return m_newAnimations.isEmpty() | 255 return m_newAnimations.isEmpty() |
| 256 && m_cancelledAnimationNames.isEmpty() | 256 && m_cancelledAnimationNames.isEmpty() |
| 257 && m_suppressedAnimations.isEmpty() | 257 && m_suppressedAnimations.isEmpty() |
| 258 && m_animationsWithPauseToggled.isEmpty() | 258 && m_animationsWithPauseToggled.isEmpty() |
| 259 && m_animationsWithUpdates.isEmpty() | 259 && m_animationsWithUpdates.isEmpty() |
| 260 && m_animationsWithStyleUpdates.isEmpty() | 260 && m_animationsWithStyleUpdates.isEmpty() |
| 261 && m_newTransitions.isEmpty() | 261 && m_newTransitions.isEmpty() |
| (...skipping 21 matching lines...) Expand all Loading... |
| 283 Vector<AtomicString> m_cancelledAnimationNames; | 283 Vector<AtomicString> m_cancelledAnimationNames; |
| 284 HeapHashSet<Member<const Animation>> m_suppressedAnimations; | 284 HeapHashSet<Member<const Animation>> m_suppressedAnimations; |
| 285 Vector<AtomicString> m_animationsWithPauseToggled; | 285 Vector<AtomicString> m_animationsWithPauseToggled; |
| 286 HeapVector<UpdatedAnimation> m_animationsWithUpdates; | 286 HeapVector<UpdatedAnimation> m_animationsWithUpdates; |
| 287 HeapVector<UpdatedAnimationStyle> m_animationsWithStyleUpdates; | 287 HeapVector<UpdatedAnimationStyle> m_animationsWithStyleUpdates; |
| 288 | 288 |
| 289 NewTransitionMap m_newTransitions; | 289 NewTransitionMap m_newTransitions; |
| 290 HashSet<CSSPropertyID> m_cancelledTransitions; | 290 HashSet<CSSPropertyID> m_cancelledTransitions; |
| 291 HashSet<CSSPropertyID> m_finishedTransitions; | 291 HashSet<CSSPropertyID> m_finishedTransitions; |
| 292 | 292 |
| 293 ActiveInterpolationMap m_activeInterpolationsForAnimations; | 293 ActiveInterpolationsMap m_activeInterpolationsForAnimations; |
| 294 ActiveInterpolationMap m_activeInterpolationsForTransitions; | 294 ActiveInterpolationsMap m_activeInterpolationsForTransitions; |
| 295 | 295 |
| 296 friend class PendingAnimationUpdate; | 296 friend class PendingAnimationUpdate; |
| 297 }; | 297 }; |
| 298 | 298 |
| 299 } // namespace blink | 299 } // namespace blink |
| 300 | 300 |
| 301 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::NewAnimation); | 301 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::NewAnimation); |
| 302 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::UpdatedAnimation); | 302 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::UpdatedAnimation); |
| 303 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::UpdatedAnimationSty
le); | 303 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::UpdatedAnimationSty
le); |
| 304 | 304 |
| 305 #endif | 305 #endif |
| OLD | NEW |