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

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

Issue 210703002: Web Animations: Sort Animations in the AnimationStack (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix compile? :| Created 6 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 | « Source/core/animation/DocumentTimeline.cpp ('k') | 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 AnimationMap m_animations; 193 AnimationMap m_animations;
194 TransitionMap m_transitions; 194 TransitionMap m_transitions;
195 OwnPtrWillBeMember<CSSAnimationUpdate> m_pendingUpdate; 195 OwnPtrWillBeMember<CSSAnimationUpdate> m_pendingUpdate;
196 196
197 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > m_previ ousActiveInterpolationsForAnimations; 197 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > m_previ ousActiveInterpolationsForAnimations;
198 198
199 static void calculateAnimationUpdate(CSSAnimationUpdate*, Element*, const El ement& parentElement, const RenderStyle&, RenderStyle* parentStyle, StyleResolve r*); 199 static void calculateAnimationUpdate(CSSAnimationUpdate*, Element*, const El ement& parentElement, const RenderStyle&, RenderStyle* parentStyle, StyleResolve r*);
200 static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element*, c onst RenderStyle&); 200 static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element*, c onst RenderStyle&);
201 static void calculateTransitionUpdateForProperty(CSSPropertyID, const CSSAni mationData*, const RenderStyle& oldStyle, const RenderStyle&, const TransitionMa p* activeTransitions, CSSAnimationUpdate*, const Element*); 201 static void calculateTransitionUpdateForProperty(CSSPropertyID, const CSSAni mationData*, const RenderStyle& oldStyle, const RenderStyle&, const TransitionMa p* activeTransitions, CSSAnimationUpdate*, const Element*);
202 202
203 static void calculateAnimationActiveInterpolations(CSSAnimationUpdate*, cons t Element*); 203 static void calculateAnimationActiveInterpolations(CSSAnimationUpdate*, cons t Element*, double timelineCurrentTime);
204 static void calculateTransitionActiveInterpolations(CSSAnimationUpdate*, con st Element*); 204 static void calculateTransitionActiveInterpolations(CSSAnimationUpdate*, con st Element*, double timelineCurrentTime);
205 205
206 class AnimationEventDelegate FINAL : public TimedItem::EventDelegate { 206 class AnimationEventDelegate FINAL : public TimedItem::EventDelegate {
207 public: 207 public:
208 AnimationEventDelegate(Element* target, const AtomicString& name) 208 AnimationEventDelegate(Element* target, const AtomicString& name)
209 : m_target(target) 209 : m_target(target)
210 , m_name(name) 210 , m_name(name)
211 { 211 {
212 } 212 }
213 virtual void onEventCondition(const TimedItem*, bool isFirstSample, Time dItem::Phase previousPhase, double previousIteration) OVERRIDE; 213 virtual void onEventCondition(const TimedItem*, bool isFirstSample, Time dItem::Phase previousPhase, double previousIteration) OVERRIDE;
214 private: 214 private:
(...skipping 12 matching lines...) Expand all
227 virtual void onEventCondition(const TimedItem*, bool isFirstSample, Time dItem::Phase previousPhase, double previousIteration) OVERRIDE; 227 virtual void onEventCondition(const TimedItem*, bool isFirstSample, Time dItem::Phase previousPhase, double previousIteration) OVERRIDE;
228 private: 228 private:
229 Element* m_target; 229 Element* m_target;
230 const CSSPropertyID m_property; 230 const CSSPropertyID m_property;
231 }; 231 };
232 }; 232 };
233 233
234 } // namespace WebCore 234 } // namespace WebCore
235 235
236 #endif 236 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/DocumentTimeline.cpp ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698