| 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 unsigned style_rule_version; | 137 unsigned style_rule_version; |
| 138 }; | 138 }; |
| 139 | 139 |
| 140 struct RunningTransition { | 140 struct RunningTransition { |
| 141 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); | 141 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); |
| 142 | 142 |
| 143 public: | 143 public: |
| 144 DEFINE_INLINE_TRACE() { visitor->Trace(animation); } | 144 DEFINE_INLINE_TRACE() { visitor->Trace(animation); } |
| 145 | 145 |
| 146 Member<Animation> animation; | 146 Member<Animation> animation; |
| 147 RefPtr<AnimatableValue> from; | 147 RefPtr<const ComputedStyle> from; |
| 148 RefPtr<AnimatableValue> to; | 148 RefPtr<const ComputedStyle> to; |
| 149 RefPtr<AnimatableValue> reversing_adjusted_start_value; | 149 RefPtr<const ComputedStyle> reversing_adjusted_start_value; |
| 150 double reversing_shortening_factor; | 150 double reversing_shortening_factor; |
| 151 }; | 151 }; |
| 152 | 152 |
| 153 HeapVector<Member<RunningAnimation>> running_animations_; | 153 HeapVector<Member<RunningAnimation>> running_animations_; |
| 154 | 154 |
| 155 using TransitionMap = HeapHashMap<PropertyHandle, RunningTransition>; | 155 using TransitionMap = HeapHashMap<PropertyHandle, RunningTransition>; |
| 156 TransitionMap transitions_; | 156 TransitionMap transitions_; |
| 157 | 157 |
| 158 CSSAnimationUpdate pending_update_; | 158 CSSAnimationUpdate pending_update_; |
| 159 | 159 |
| 160 ActiveInterpolationsMap previous_active_interpolations_for_animations_; | 160 ActiveInterpolationsMap previous_active_interpolations_for_animations_; |
| 161 | 161 |
| 162 struct TransitionUpdateState { | 162 struct TransitionUpdateState { |
| 163 STACK_ALLOCATED(); | 163 STACK_ALLOCATED(); |
| 164 CSSAnimationUpdate& update; | 164 CSSAnimationUpdate& update; |
| 165 Member<const Element> animating_element; | 165 Member<const Element> animating_element; |
| 166 const ComputedStyle& old_style; | 166 const ComputedStyle& old_style; |
| 167 const ComputedStyle& style; | 167 const ComputedStyle& style; |
| 168 RefPtr<const ComputedStyle> cloned_style; |
| 168 const TransitionMap* active_transitions; | 169 const TransitionMap* active_transitions; |
| 169 HashSet<PropertyHandle>& listed_properties; | 170 HashSet<PropertyHandle>& listed_properties; |
| 170 const CSSTransitionData& transition_data; | 171 const CSSTransitionData& transition_data; |
| 171 }; | 172 }; |
| 172 | 173 |
| 173 static void CalculateTransitionUpdateForCustomProperty( | 174 static void CalculateTransitionUpdateForCustomProperty( |
| 174 TransitionUpdateState&, | 175 TransitionUpdateState&, |
| 175 const CSSTransitionData::TransitionProperty&, | 176 const CSSTransitionData::TransitionProperty&, |
| 176 size_t transition_index); | 177 size_t transition_index); |
| 177 | 178 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 | 241 |
| 241 Member<Element> transition_target_; | 242 Member<Element> transition_target_; |
| 242 PropertyHandle property_; | 243 PropertyHandle property_; |
| 243 AnimationEffectReadOnly::Phase previous_phase_; | 244 AnimationEffectReadOnly::Phase previous_phase_; |
| 244 }; | 245 }; |
| 245 }; | 246 }; |
| 246 | 247 |
| 247 } // namespace blink | 248 } // namespace blink |
| 248 | 249 |
| 249 #endif | 250 #endif |
| OLD | NEW |