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

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

Issue 863863004: Implemented additive animations for length (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: More comprehensive non-negative length layout tests Created 5 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 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef CSSAnimations_h 31 #ifndef CSSAnimations_h
32 #define CSSAnimations_h 32 #define CSSAnimations_h
33 33
34 #include "core/animation/InertAnimation.h" 34 #include "core/animation/InertAnimation.h"
35 #include "core/animation/Interpolation.h" 35 #include "core/animation/Interpolation.h"
36 #include "core/animation/InterpolationPipeline.h"
36 #include "core/animation/css/CSSAnimationData.h" 37 #include "core/animation/css/CSSAnimationData.h"
37 #include "core/animation/css/CSSAnimationUpdate.h" 38 #include "core/animation/css/CSSAnimationUpdate.h"
38 #include "core/css/CSSKeyframesRule.h" 39 #include "core/css/CSSKeyframesRule.h"
39 #include "core/css/StylePropertySet.h" 40 #include "core/css/StylePropertySet.h"
40 #include "core/dom/Document.h" 41 #include "core/dom/Document.h"
41 #include "core/dom/Element.h" 42 #include "core/dom/Element.h"
42 #include "wtf/HashMap.h" 43 #include "wtf/HashMap.h"
43 #include "wtf/text/AtomicString.h" 44 #include "wtf/text/AtomicString.h"
44 45
45 namespace blink { 46 namespace blink {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 }; 116 };
116 117
117 using AnimationMap = WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<Runn ingAnimation>>; 118 using AnimationMap = WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<Runn ingAnimation>>;
118 AnimationMap m_animations; 119 AnimationMap m_animations;
119 120
120 using TransitionMap = WillBeHeapHashMap<CSSPropertyID, RunningTransition>; 121 using TransitionMap = WillBeHeapHashMap<CSSPropertyID, RunningTransition>;
121 TransitionMap m_transitions; 122 TransitionMap m_transitions;
122 123
123 OwnPtrWillBeMember<CSSAnimationUpdate> m_pendingUpdate; 124 OwnPtrWillBeMember<CSSAnimationUpdate> m_pendingUpdate;
124 125
125 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>> m_previo usActiveInterpolationsForAnimations; 126 InterpolationPipelineMap m_previousActiveInterpolationsForAnimations;
126 127
127 static void calculateAnimationUpdate(CSSAnimationUpdate*, const Element* ani matingElement, Element&, const LayoutStyle&, LayoutStyle* parentStyle, StyleReso lver*); 128 static void calculateAnimationUpdate(CSSAnimationUpdate*, const Element* ani matingElement, Element&, const LayoutStyle&, LayoutStyle* parentStyle, StyleReso lver*);
128 static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element* an imatingElement, const LayoutStyle&); 129 static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element* an imatingElement, const LayoutStyle&);
129 static void calculateTransitionUpdateForProperty(CSSPropertyID, CSSPropertyI D eventId, const CSSTransitionData&, size_t transitionIndex, const LayoutStyle& oldStyle, const LayoutStyle&, const TransitionMap* activeTransitions, CSSAnimati onUpdate*, const Element*); 130 static void calculateTransitionUpdateForProperty(CSSPropertyID, CSSPropertyI D eventId, const CSSTransitionData&, size_t transitionIndex, const LayoutStyle& oldStyle, const LayoutStyle&, const TransitionMap* activeTransitions, CSSAnimati onUpdate*, const Element*);
130 131
131 static void calculateAnimationActiveInterpolations(CSSAnimationUpdate*, cons t Element* animatingElement, double timelineCurrentTime); 132 static void calculateAnimationActiveInterpolations(CSSAnimationUpdate*, cons t Element* animatingElement, double timelineCurrentTime);
132 static void calculateTransitionActiveInterpolations(CSSAnimationUpdate*, con st Element* animatingElement, double timelineCurrentTime); 133 static void calculateTransitionActiveInterpolations(CSSAnimationUpdate*, con st Element* animatingElement, double timelineCurrentTime);
133 134
134 class AnimationEventDelegate final : public AnimationNode::EventDelegate { 135 class AnimationEventDelegate final : public AnimationNode::EventDelegate {
135 public: 136 public:
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 177
177 RawPtrWillBeMember<Element> m_transitionTarget; 178 RawPtrWillBeMember<Element> m_transitionTarget;
178 const CSSPropertyID m_property; 179 const CSSPropertyID m_property;
179 AnimationNode::Phase m_previousPhase; 180 AnimationNode::Phase m_previousPhase;
180 }; 181 };
181 }; 182 };
182 183
183 } // namespace blink 184 } // namespace blink
184 185
185 #endif 186 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698