| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 CSSAnimations& cssAnimations() { return m_cssAnimations; } | 63 CSSAnimations& cssAnimations() { return m_cssAnimations; } |
| 64 const CSSAnimations& cssAnimations() const { return m_cssAnimations; } | 64 const CSSAnimations& cssAnimations() const { return m_cssAnimations; } |
| 65 | 65 |
| 66 typedef HashCountedSet<Player*> PlayerSet; | 66 typedef HashCountedSet<Player*> PlayerSet; |
| 67 // Players which have animations targeting this element. | 67 // Players which have animations targeting this element. |
| 68 const PlayerSet& players() const { return m_players; } | 68 const PlayerSet& players() const { return m_players; } |
| 69 PlayerSet& players() { return m_players; } | 69 PlayerSet& players() { return m_players; } |
| 70 | 70 |
| 71 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is
Empty(); } | 71 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is
Empty(); } |
| 72 | 72 |
| 73 // FIXME: This and most of this class needs to be renamed to consider 'curre
nt' |
| 74 // rather than 'active' animations. |
| 73 bool hasActiveAnimations(CSSPropertyID) const; | 75 bool hasActiveAnimations(CSSPropertyID) const; |
| 74 bool hasActiveAnimationsOnCompositor(CSSPropertyID) const; | 76 bool hasActiveAnimationsOnCompositor(CSSPropertyID) const; |
| 75 void cancelAnimationOnCompositor(); | 77 void cancelAnimationOnCompositor(); |
| 76 | 78 |
| 77 void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleCh
ange = animationStyleChange; } | 79 void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleCh
ange = animationStyleChange; } |
| 78 | 80 |
| 79 private: | 81 private: |
| 80 bool isAnimationStyleChange() const { return m_animationStyleChange; } | 82 bool isAnimationStyleChange() const { return m_animationStyleChange; } |
| 81 | 83 |
| 82 AnimationStack m_defaultStack; | 84 AnimationStack m_defaultStack; |
| 83 CSSAnimations m_cssAnimations; | 85 CSSAnimations m_cssAnimations; |
| 84 PlayerSet m_players; | 86 PlayerSet m_players; |
| 85 bool m_animationStyleChange; | 87 bool m_animationStyleChange; |
| 86 | 88 |
| 87 // CSSAnimations checks if a style change is due to animation. | 89 // CSSAnimations checks if a style change is due to animation. |
| 88 friend class CSSAnimations; | 90 friend class CSSAnimations; |
| 89 }; | 91 }; |
| 90 | 92 |
| 91 } // namespace WebCore | 93 } // namespace WebCore |
| 92 | 94 |
| 93 #endif | 95 #endif |
| OLD | NEW |