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

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

Issue 2831273002: Split active animation interpolation storage between standard and custom properties (Closed)
Patch Set: Review Review changes Created 3 years, 6 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 public: 57 public:
58 CSSAnimations(); 58 CSSAnimations();
59 59
60 bool IsAnimationForInspector(const Animation&); 60 bool IsAnimationForInspector(const Animation&);
61 bool IsTransitionAnimationForInspector(const Animation&) const; 61 bool IsTransitionAnimationForInspector(const Animation&) const;
62 62
63 static const StylePropertyShorthand& PropertiesForTransitionAll(); 63 static const StylePropertyShorthand& PropertiesForTransitionAll();
64 static bool IsAnimationAffectingProperty(CSSPropertyID); 64 static bool IsAnimationAffectingProperty(CSSPropertyID);
65 static bool IsAffectedByKeyframesFromScope(const Element&, const TreeScope&); 65 static bool IsAffectedByKeyframesFromScope(const Element&, const TreeScope&);
66 static bool IsAnimatingCustomProperties(const ElementAnimations*); 66 static bool IsAnimatingCustomProperties(const ElementAnimations*);
67 static bool IsCustomPropertyHandle(const PropertyHandle&);
68 static void CalculateAnimationUpdate(CSSAnimationUpdate&, 67 static void CalculateAnimationUpdate(CSSAnimationUpdate&,
69 const Element* animating_element, 68 const Element* animating_element,
70 Element&, 69 Element&,
71 const ComputedStyle&, 70 const ComputedStyle&,
72 ComputedStyle* parent_style, 71 ComputedStyle* parent_style,
73 StyleResolver*); 72 StyleResolver*);
74 static void CalculateCompositorAnimationUpdate( 73 static void CalculateCompositorAnimationUpdate(
75 CSSAnimationUpdate&, 74 CSSAnimationUpdate&,
76 const Element* animating_element, 75 const Element* animating_element,
77 Element&, 76 Element&,
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 double reversing_shortening_factor; 149 double reversing_shortening_factor;
151 }; 150 };
152 151
153 HeapVector<Member<RunningAnimation>> running_animations_; 152 HeapVector<Member<RunningAnimation>> running_animations_;
154 153
155 using TransitionMap = HeapHashMap<PropertyHandle, RunningTransition>; 154 using TransitionMap = HeapHashMap<PropertyHandle, RunningTransition>;
156 TransitionMap transitions_; 155 TransitionMap transitions_;
157 156
158 CSSAnimationUpdate pending_update_; 157 CSSAnimationUpdate pending_update_;
159 158
160 ActiveInterpolationsMap previous_active_interpolations_for_animations_; 159 ActiveInterpolationsMap previous_active_interpolations_for_custom_animations_;
160 ActiveInterpolationsMap
161 previous_active_interpolations_for_standard_animations_;
161 162
162 struct TransitionUpdateState { 163 struct TransitionUpdateState {
163 STACK_ALLOCATED(); 164 STACK_ALLOCATED();
164 CSSAnimationUpdate& update; 165 CSSAnimationUpdate& update;
165 Member<const Element> animating_element; 166 Member<const Element> animating_element;
166 const ComputedStyle& old_style; 167 const ComputedStyle& old_style;
167 const ComputedStyle& style; 168 const ComputedStyle& 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;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698