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

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

Issue 2521103004: Revert of Apply custom property animation (Closed)
Patch Set: Created 4 years 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
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 void calculateUpdate(const Element* animatingElement,
67 static bool isCustomPropertyHandle(const PropertyHandle&); 67 Element&,
68 static void calculateAnimationUpdate(CSSAnimationUpdate&, 68 const ComputedStyle&,
69 const Element* animatingElement, 69 ComputedStyle* parentStyle,
70 Element&, 70 CSSAnimationUpdate&,
71 const ComputedStyle&, 71 StyleResolver*);
72 ComputedStyle* parentStyle,
73 StyleResolver*);
74 static void calculateCompositorAndTransitionUpdate(
75 const Element* animatingElement,
76 Element&,
77 const ComputedStyle&,
78 ComputedStyle* parentStyle,
79 CSSAnimationUpdate&);
80 static void snapshotCompositorKeyframes(Element&, 72 static void snapshotCompositorKeyframes(Element&,
81 CSSAnimationUpdate&, 73 CSSAnimationUpdate&,
82 const ComputedStyle&, 74 const ComputedStyle&,
83 const ComputedStyle* parentStyle); 75 const ComputedStyle* parentStyle);
84 76
85 void setPendingUpdate(const CSSAnimationUpdate& update) { 77 void setPendingUpdate(const CSSAnimationUpdate& update) {
86 clearPendingUpdate(); 78 clearPendingUpdate();
87 m_pendingUpdate.copy(update); 79 m_pendingUpdate.copy(update);
88 } 80 }
89 void clearPendingUpdate() { m_pendingUpdate.clear(); } 81 void clearPendingUpdate() { m_pendingUpdate.clear(); }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 CSSAnimationUpdate m_pendingUpdate; 141 CSSAnimationUpdate m_pendingUpdate;
150 142
151 ActiveInterpolationsMap m_previousActiveInterpolationsForAnimations; 143 ActiveInterpolationsMap m_previousActiveInterpolationsForAnimations;
152 144
153 static void calculateCompositorAnimationUpdate( 145 static void calculateCompositorAnimationUpdate(
154 CSSAnimationUpdate&, 146 CSSAnimationUpdate&,
155 const Element* animatingElement, 147 const Element* animatingElement,
156 Element&, 148 Element&,
157 const ComputedStyle&, 149 const ComputedStyle&,
158 const ComputedStyle* parentStyle); 150 const ComputedStyle* parentStyle);
151 static void calculateAnimationUpdate(CSSAnimationUpdate&,
152 const Element* animatingElement,
153 Element&,
154 const ComputedStyle&,
155 ComputedStyle* parentStyle,
156 StyleResolver*);
159 static void calculateTransitionUpdate(CSSAnimationUpdate&, 157 static void calculateTransitionUpdate(CSSAnimationUpdate&,
160 const Element* animatingElement, 158 const Element* animatingElement,
161 const ComputedStyle&); 159 const ComputedStyle&);
162 static void calculateTransitionUpdateForProperty( 160 static void calculateTransitionUpdateForProperty(
163 CSSPropertyID, 161 CSSPropertyID,
164 const CSSTransitionData&, 162 const CSSTransitionData&,
165 size_t transitionIndex, 163 size_t transitionIndex,
166 const ComputedStyle& oldStyle, 164 const ComputedStyle& oldStyle,
167 const ComputedStyle&, 165 const ComputedStyle&,
168 const TransitionMap* activeTransitions, 166 const TransitionMap* activeTransitions,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 221
224 Member<Element> m_transitionTarget; 222 Member<Element> m_transitionTarget;
225 const CSSPropertyID m_property; 223 const CSSPropertyID m_property;
226 AnimationEffectReadOnly::Phase m_previousPhase; 224 AnimationEffectReadOnly::Phase m_previousPhase;
227 }; 225 };
228 }; 226 };
229 227
230 } // namespace blink 228 } // namespace blink
231 229
232 #endif 230 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698