Source/core/animation/css/CSSAnimations.h - Issue 863863004: Implemented additive animations for length

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: Fixed AnimationStackTest 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

« Source/core/animation/Interpolation.h ('K') | « Source/core/animation/css/CSSAnimationUpdate.h ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | Source/core/css/resolver/StyleResolver.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 104 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
115 };	115 };

116	116

117 using AnimationMap = WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<Runn ingAnimation>>;	117 using AnimationMap = WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<Runn ingAnimation>>;

118 AnimationMap m_animations;	118 AnimationMap m_animations;

119	119

120 using TransitionMap = WillBeHeapHashMap<CSSPropertyID, RunningTransition>;	120 using TransitionMap = WillBeHeapHashMap<CSSPropertyID, RunningTransition>;

121 TransitionMap m_transitions;	121 TransitionMap m_transitions;

122	122

123 OwnPtrWillBeMember<CSSAnimationUpdate> m_pendingUpdate;	123 OwnPtrWillBeMember<CSSAnimationUpdate> m_pendingUpdate;

124	124

125 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>> m_previo usActiveInterpolationsForAnimations;	125 InterpolationPipelineMap m_previousActiveInterpolationsForAnimations;

126	126

127 static void calculateAnimationUpdate(CSSAnimationUpdate, const Element ani matingElement, Element&, const LayoutStyle&, LayoutStyle* parentStyle, StyleReso lver*);	127 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&);	128 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);	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	130

131 static void calculateAnimationActiveInterpolations(CSSAnimationUpdate, cons t Element animatingElement, double timelineCurrentTime);	131 static void calculateAnimationActiveInterpolations(CSSAnimationUpdate, cons t Element animatingElement, double timelineCurrentTime);

132 static void calculateTransitionActiveInterpolations(CSSAnimationUpdate, con st Element animatingElement, double timelineCurrentTime);	132 static void calculateTransitionActiveInterpolations(CSSAnimationUpdate, con st Element animatingElement, double timelineCurrentTime);

133	133

134 class AnimationEventDelegate final : public AnimationNode::EventDelegate {	134 class AnimationEventDelegate final : public AnimationNode::EventDelegate {

135 public:	135 public:

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
176	176

177 RawPtrWillBeMember<Element> m_transitionTarget;	177 RawPtrWillBeMember<Element> m_transitionTarget;

178 const CSSPropertyID m_property;	178 const CSSPropertyID m_property;

179 AnimationNode::Phase m_previousPhase;	179 AnimationNode::Phase m_previousPhase;

180 };	180 };

181 };	181 };

182	182

183 } // namespace blink	183 } // namespace blink

184	184

185 #endif	185 #endif

OLD	NEW