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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
57 | 57 |
58 // Animations that are currently active for this element, their effects will be applied | 58 // Animations that are currently active for this element, their effects will be applied |
59 // during a style recalc. CSS Transitions are included in this stack. | 59 // during a style recalc. CSS Transitions are included in this stack. |
60 AnimationStack& defaultStack() { return m_defaultStack; } | 60 AnimationStack& defaultStack() { return m_defaultStack; } |
61 // Tracks the state of active CSS Animations and Transitions. The individual animations | 61 // Tracks the state of active CSS Animations and Transitions. The individual animations |
62 // will also be part of the default stack, but the mapping betwen animation name and | 62 // will also be part of the default stack, but the mapping betwen animation name and |
63 // player is kept here. | 63 // player is kept here. |
64 CSSAnimations& cssAnimations() { return m_cssAnimations; } | 64 CSSAnimations& cssAnimations() { return m_cssAnimations; } |
65 const CSSAnimations& cssAnimations() const { return m_cssAnimations; } | 65 const CSSAnimations& cssAnimations() const { return m_cssAnimations; } |
66 | 66 |
67 typedef HashMap<AnimationPlayer*, int> AnimationPlayerCountedSet; | 67 typedef WillBeHeapHashMap<RawPtrWillBeMember<AnimationPlayer>, int> Animatio nPlayerCountedSet; |
Mads Ager (chromium)
2014/04/29 10:29:41
Maybe rename the type to AnimationPlayerSet since
Timothy Loh
2014/05/02 05:46:00
This should probably be a weak member.
haraken
2014/05/04 15:31:47
Agreed, this should be a weak member.
| |
68 // AnimationPlayers which have animations targeting this element. | 68 // AnimationPlayers which have animations targeting this element. |
69 const AnimationPlayerCountedSet& players() const { return m_players; } | 69 const AnimationPlayerCountedSet& players() const { return m_players; } |
70 void addPlayer(AnimationPlayer*); | 70 void addPlayer(AnimationPlayer*); |
71 void removePlayer(AnimationPlayer*); | 71 void removePlayer(AnimationPlayer*); |
72 | 72 |
73 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is Empty() && m_animations.isEmpty(); } | 73 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is Empty() && m_animations.isEmpty(); } |
74 | 74 |
75 void cancelAnimationOnCompositor(); | 75 void cancelAnimationOnCompositor(); |
76 | 76 |
77 void updateAnimationFlags(RenderStyle&); | 77 void updateAnimationFlags(RenderStyle&); |
(...skipping 16 matching lines...) Expand all Loading... | |
94 // won't be needed once Element and Animation are moved to Oilpan. | 94 // won't be needed once Element and Animation are moved to Oilpan. |
95 Vector<Animation*> m_animations; | 95 Vector<Animation*> m_animations; |
96 | 96 |
97 // CSSAnimations checks if a style change is due to animation. | 97 // CSSAnimations checks if a style change is due to animation. |
98 friend class CSSAnimations; | 98 friend class CSSAnimations; |
99 }; | 99 }; |
100 | 100 |
101 } // namespace WebCore | 101 } // namespace WebCore |
102 | 102 |
103 #endif | 103 #endif |
OLD | NEW |