| 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 } | 74 } |
| 75 void maybeApplyPendingUpdate(Element*); | 75 void maybeApplyPendingUpdate(Element*); |
| 76 bool isEmpty() const { return m_runningAnimations.isEmpty() && m_transitions
.isEmpty() && m_pendingUpdate.isEmpty(); } | 76 bool isEmpty() const { return m_runningAnimations.isEmpty() && m_transitions
.isEmpty() && m_pendingUpdate.isEmpty(); } |
| 77 void cancel(); | 77 void cancel(); |
| 78 | 78 |
| 79 DECLARE_TRACE(); | 79 DECLARE_TRACE(); |
| 80 | 80 |
| 81 private: | 81 private: |
| 82 class RunningAnimation final : public GarbageCollectedFinalized<RunningAnima
tion> { | 82 class RunningAnimation final : public GarbageCollectedFinalized<RunningAnima
tion> { |
| 83 public: | 83 public: |
| 84 RunningAnimation(Animation* animation, CSSAnimationUpdate::NewAnimation
newAnimation) | 84 RunningAnimation(Animation* animation, NewCSSAnimation newAnimation) |
| 85 : animation(animation) | 85 : animation(animation) |
| 86 , name(newAnimation.name) | 86 , name(newAnimation.name) |
| 87 , nameIndex(newAnimation.nameIndex) | 87 , nameIndex(newAnimation.nameIndex) |
| 88 , specifiedTiming(newAnimation.timing) | 88 , specifiedTiming(newAnimation.timing) |
| 89 , styleRule(newAnimation.styleRule) | 89 , styleRule(newAnimation.styleRule) |
| 90 , styleRuleVersion(newAnimation.styleRuleVersion) | 90 , styleRuleVersion(newAnimation.styleRuleVersion) |
| 91 { | 91 { |
| 92 } | 92 } |
| 93 | 93 |
| 94 void update(CSSAnimationUpdate::UpdatedAnimation update) | 94 void update(UpdatedCSSAnimation update) |
| 95 { | 95 { |
| 96 ASSERT(update.animation == animation); | 96 ASSERT(update.animation == animation); |
| 97 styleRule = update.styleRule; | 97 styleRule = update.styleRule; |
| 98 styleRuleVersion = update.styleRuleVersion; | 98 styleRuleVersion = update.styleRuleVersion; |
| 99 specifiedTiming = update.specifiedTiming; | 99 specifiedTiming = update.specifiedTiming; |
| 100 } | 100 } |
| 101 | 101 |
| 102 DEFINE_INLINE_TRACE() | 102 DEFINE_INLINE_TRACE() |
| 103 { | 103 { |
| 104 visitor->trace(animation); | 104 visitor->trace(animation); |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 | 190 |
| 191 Member<Element> m_transitionTarget; | 191 Member<Element> m_transitionTarget; |
| 192 const CSSPropertyID m_property; | 192 const CSSPropertyID m_property; |
| 193 AnimationEffect::Phase m_previousPhase; | 193 AnimationEffect::Phase m_previousPhase; |
| 194 }; | 194 }; |
| 195 }; | 195 }; |
| 196 | 196 |
| 197 } // namespace blink | 197 } // namespace blink |
| 198 | 198 |
| 199 #endif | 199 #endif |
| OLD | NEW |