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

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

Issue 2680923005: Refactor CSS Transitions to use CSSInterpolationTypes instead of AnimatableValues (Closed)
Patch Set: Fix transition tests to not expect incorrect behaviour Created 3 years, 10 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 unsigned styleRuleVersion; 132 unsigned styleRuleVersion;
133 }; 133 };
134 134
135 struct RunningTransition { 135 struct RunningTransition {
136 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); 136 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
137 137
138 public: 138 public:
139 DEFINE_INLINE_TRACE() { visitor->trace(animation); } 139 DEFINE_INLINE_TRACE() { visitor->trace(animation); }
140 140
141 Member<Animation> animation; 141 Member<Animation> animation;
142 const AnimatableValue* from; 142 RefPtr<AnimatableValue> from;
143 const AnimatableValue* to; 143 RefPtr<AnimatableValue> to;
144 RefPtr<AnimatableValue> reversingAdjustedStartValue; 144 RefPtr<AnimatableValue> reversingAdjustedStartValue;
145 double reversingShorteningFactor; 145 double reversingShorteningFactor;
146 }; 146 };
147 147
148 HeapVector<Member<RunningAnimation>> m_runningAnimations; 148 HeapVector<Member<RunningAnimation>> m_runningAnimations;
149 149
150 using TransitionMap = HeapHashMap<CSSPropertyID, RunningTransition>; 150 using TransitionMap = HeapHashMap<CSSPropertyID, RunningTransition>;
151 TransitionMap m_transitions; 151 TransitionMap m_transitions;
152 152
153 CSSAnimationUpdate m_pendingUpdate; 153 CSSAnimationUpdate m_pendingUpdate;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 218
219 Member<Element> m_transitionTarget; 219 Member<Element> m_transitionTarget;
220 const CSSPropertyID m_property; 220 const CSSPropertyID m_property;
221 AnimationEffectReadOnly::Phase m_previousPhase; 221 AnimationEffectReadOnly::Phase m_previousPhase;
222 }; 222 };
223 }; 223 };
224 224
225 } // namespace blink 225 } // namespace blink
226 226
227 #endif 227 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698