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

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

Issue 2725803006: Move standard transition handling logic into separate function (Closed)
Patch Set: fixReference Created 3 years, 9 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 HeapVector<Member<RunningAnimation>> m_runningAnimations; 148 HeapVector<Member<RunningAnimation>> m_runningAnimations;
149 149
150 using TransitionMap = HeapHashMap<PropertyHandle, RunningTransition>; 150 using TransitionMap = HeapHashMap<PropertyHandle, RunningTransition>;
151 TransitionMap m_transitions; 151 TransitionMap m_transitions;
152 152
153 CSSAnimationUpdate m_pendingUpdate; 153 CSSAnimationUpdate m_pendingUpdate;
154 154
155 ActiveInterpolationsMap m_previousActiveInterpolationsForAnimations; 155 ActiveInterpolationsMap m_previousActiveInterpolationsForAnimations;
156 156
157 static void calculateTransitionUpdateForProperty( 157 struct TransitionUpdateState {
158 const PropertyHandle&, 158 STACK_ALLOCATED();
159 const CSSTransitionData&, 159 CSSAnimationUpdate& update;
160 size_t transitionIndex, 160 Member<const Element> animatingElement;
161 const ComputedStyle& oldStyle, 161 const ComputedStyle& oldStyle;
162 const ComputedStyle&, 162 const ComputedStyle& style;
163 const TransitionMap* activeTransitions, 163 const TransitionMap* activeTransitions;
164 CSSAnimationUpdate&, 164 std::bitset<numCSSProperties>& listedProperties;
165 const Element*); 165 const CSSTransitionData& transitionData;
166 };
167
168 static void calculateTransitionUpdateForStandardProperty(
169 TransitionUpdateState&,
170 const CSSTransitionData::TransitionProperty&,
171 size_t transitionIndex);
172
173 static void calculateTransitionUpdateForProperty(TransitionUpdateState&,
174 const PropertyHandle&,
175 size_t transitionIndex);
166 176
167 static void calculateAnimationActiveInterpolations( 177 static void calculateAnimationActiveInterpolations(
168 CSSAnimationUpdate&, 178 CSSAnimationUpdate&,
169 const Element* animatingElement); 179 const Element* animatingElement);
170 static void calculateTransitionActiveInterpolations( 180 static void calculateTransitionActiveInterpolations(
171 CSSAnimationUpdate&, 181 CSSAnimationUpdate&,
172 const Element* animatingElement); 182 const Element* animatingElement);
173 183
174 class AnimationEventDelegate final 184 class AnimationEventDelegate final
175 : public AnimationEffectReadOnly::EventDelegate { 185 : public AnimationEffectReadOnly::EventDelegate {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 229
220 Member<Element> m_transitionTarget; 230 Member<Element> m_transitionTarget;
221 PropertyHandle m_property; 231 PropertyHandle m_property;
222 AnimationEffectReadOnly::Phase m_previousPhase; 232 AnimationEffectReadOnly::Phase m_previousPhase;
223 }; 233 };
224 }; 234 };
225 235
226 } // namespace blink 236 } // namespace blink
227 237
228 #endif 238 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698