OLD | NEW |
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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 | 108 |
109 AtomicString name; | 109 AtomicString name; |
110 RefPtrWillBeMember<InertAnimation> animation; | 110 RefPtrWillBeMember<InertAnimation> animation; |
111 }; | 111 }; |
112 | 112 |
113 struct UpdatedAnimationTiming { | 113 struct UpdatedAnimationTiming { |
114 ALLOW_ONLY_INLINE_ALLOCATION(); | 114 ALLOW_ONLY_INLINE_ALLOCATION(); |
115 public: | 115 public: |
116 void trace(Visitor* visitor) | 116 void trace(Visitor* visitor) |
117 { | 117 { |
| 118 visitor->trace(player); |
118 visitor->trace(animation); | 119 visitor->trace(animation); |
119 } | 120 } |
120 | 121 |
121 RawPtrWillBeMember<AnimationPlayer> player; | 122 RawPtrWillBeMember<AnimationPlayer> player; |
122 RefPtrWillBeMember<InertAnimation> animation; | 123 RefPtrWillBeMember<InertAnimation> animation; |
123 Timing newTiming; | 124 Timing newTiming; |
124 }; | 125 }; |
125 | 126 |
126 const WillBeHeapVector<NewAnimation>& newAnimations() const { return m_newAn
imations; } | 127 const WillBeHeapVector<NewAnimation>& newAnimations() const { return m_newAn
imations; } |
127 const Vector<AtomicString>& cancelledAnimationNames() const { return m_cance
lledAnimationNames; } | 128 const Vector<AtomicString>& cancelledAnimationNames() const { return m_cance
lledAnimationNames; } |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 void cancel(); | 213 void cancel(); |
213 | 214 |
214 void trace(Visitor*); | 215 void trace(Visitor*); |
215 | 216 |
216 private: | 217 private: |
217 struct RunningTransition { | 218 struct RunningTransition { |
218 ALLOW_ONLY_INLINE_ALLOCATION(); | 219 ALLOW_ONLY_INLINE_ALLOCATION(); |
219 public: | 220 public: |
220 void trace(Visitor* visitor) | 221 void trace(Visitor* visitor) |
221 { | 222 { |
| 223 visitor->trace(player); |
222 visitor->trace(from); | 224 visitor->trace(from); |
223 visitor->trace(to); | 225 visitor->trace(to); |
224 visitor->trace(player); | |
225 } | 226 } |
226 | 227 |
227 RefPtrWillBeMember<AnimationPlayer> player; | 228 RefPtrWillBeMember<AnimationPlayer> player; |
228 RawPtrWillBeMember<const AnimatableValue> from; | 229 RawPtrWillBeMember<const AnimatableValue> from; |
229 RawPtrWillBeMember<const AnimatableValue> to; | 230 RawPtrWillBeMember<const AnimatableValue> to; |
230 }; | 231 }; |
231 | 232 |
232 using AnimationMap = WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<Anim
ationPlayer>>; | 233 using AnimationMap = WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<Anim
ationPlayer>>; |
233 AnimationMap m_animations; | 234 AnimationMap m_animations; |
234 | 235 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
280 private: | 281 private: |
281 RawPtrWillBeMember<Element> m_target; | 282 RawPtrWillBeMember<Element> m_target; |
282 const CSSPropertyID m_property; | 283 const CSSPropertyID m_property; |
283 AnimationNode::Phase m_previousPhase; | 284 AnimationNode::Phase m_previousPhase; |
284 }; | 285 }; |
285 }; | 286 }; |
286 | 287 |
287 } // namespace blink | 288 } // namespace blink |
288 | 289 |
289 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::NewAnimation); | 290 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::NewAnimation); |
| 291 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::UpdatedAnimationTim
ing); |
290 | 292 |
291 #endif | 293 #endif |
OLD | NEW |