| 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 }; | 169 }; |
| 170 typedef HashMap<CSSPropertyID, RunningTransition > TransitionMap; | 170 typedef HashMap<CSSPropertyID, RunningTransition > TransitionMap; |
| 171 AnimationMap m_animations; | 171 AnimationMap m_animations; |
| 172 TransitionMap m_transitions; | 172 TransitionMap m_transitions; |
| 173 OwnPtr<CSSAnimationUpdate> m_pendingUpdate; | 173 OwnPtr<CSSAnimationUpdate> m_pendingUpdate; |
| 174 | 174 |
| 175 AnimationEffect::CompositableValueMap m_previousCompositableValuesForAnimati
ons; | 175 AnimationEffect::CompositableValueMap m_previousCompositableValuesForAnimati
ons; |
| 176 | 176 |
| 177 static void calculateAnimationUpdate(CSSAnimationUpdate*, Element*, const Re
nderStyle&, StyleResolver*); | 177 static void calculateAnimationUpdate(CSSAnimationUpdate*, Element*, const Re
nderStyle&, StyleResolver*); |
| 178 static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element*, c
onst RenderStyle&); | 178 static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element*, c
onst RenderStyle&); |
| 179 static void calculateTransitionUpdateForProperty(CSSPropertyID, const CSSAni
mationData*, const RenderStyle& oldStyle, const RenderStyle&, const TransitionMa
p* activeTransitions, CSSAnimationUpdate*); | 179 static void calculateTransitionUpdateForProperty(CSSPropertyID, const CSSAni
mationData*, const RenderStyle& oldStyle, const RenderStyle&, const TransitionMa
p* activeTransitions, CSSAnimationUpdate*, const Element*); |
| 180 | 180 |
| 181 static void calculateAnimationCompositableValues(CSSAnimationUpdate*, const
Element*); | 181 static void calculateAnimationCompositableValues(CSSAnimationUpdate*, const
Element*); |
| 182 static void calculateTransitionCompositableValues(CSSAnimationUpdate*, const
Element*); | 182 static void calculateTransitionCompositableValues(CSSAnimationUpdate*, const
Element*); |
| 183 | 183 |
| 184 class AnimationEventDelegate FINAL : public TimedItem::EventDelegate { | 184 class AnimationEventDelegate FINAL : public TimedItem::EventDelegate { |
| 185 public: | 185 public: |
| 186 AnimationEventDelegate(Element* target, const AtomicString& name) | 186 AnimationEventDelegate(Element* target, const AtomicString& name) |
| 187 : m_target(target) | 187 : m_target(target) |
| 188 , m_name(name) | 188 , m_name(name) |
| 189 { | 189 { |
| (...skipping 15 matching lines...) Expand all Loading... |
| 205 virtual void onEventCondition(const TimedItem*, bool isFirstSample, Time
dItem::Phase previousPhase, double previousIteration) OVERRIDE; | 205 virtual void onEventCondition(const TimedItem*, bool isFirstSample, Time
dItem::Phase previousPhase, double previousIteration) OVERRIDE; |
| 206 private: | 206 private: |
| 207 Element* m_target; | 207 Element* m_target; |
| 208 const CSSPropertyID m_property; | 208 const CSSPropertyID m_property; |
| 209 }; | 209 }; |
| 210 }; | 210 }; |
| 211 | 211 |
| 212 } // namespace WebCore | 212 } // namespace WebCore |
| 213 | 213 |
| 214 #endif | 214 #endif |
| OLD | NEW |