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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
90 | 90 |
91 void detachFromDocument(); | 91 void detachFromDocument(); |
92 | 92 |
93 protected: | 93 protected: |
94 DocumentTimeline(Document*, PassOwnPtr<PlatformTiming>); | 94 DocumentTimeline(Document*, PassOwnPtr<PlatformTiming>); |
95 | 95 |
96 private: | 96 private: |
97 double m_zeroTime; | 97 double m_zeroTime; |
98 Document* m_document; | 98 Document* m_document; |
99 // AnimationPlayers which will be updated on the next frame | 99 // AnimationPlayers which will be updated on the next frame |
100 // i.e. current, in effect, or had timing changed | 100 // i.e. current, in effect, or had timing changed. This needs |
101 HashSet<RefPtr<AnimationPlayer> > m_playersNeedingUpdate; | 101 // to be a collection that can be updated while we iterate |
102 // over it (this happens during pauseAnimationsForTesting). | |
Timothy Loh
2014/03/31 23:33:22
So the problem is that we're trying to modify the
| |
103 ListHashSet<RefPtr<AnimationPlayer> > m_playersNeedingUpdate; | |
102 HashSet<AnimationPlayer*> m_players; | 104 HashSet<AnimationPlayer*> m_players; |
103 bool m_hasOutdatedAnimationPlayer; | 105 bool m_hasOutdatedAnimationPlayer; |
104 | 106 |
105 void wake(); | 107 void wake(); |
106 | 108 |
107 friend class SMILTimeContainer; | 109 friend class SMILTimeContainer; |
108 static const double s_minimumDelay; | 110 static const double s_minimumDelay; |
109 | 111 |
110 OwnPtr<PlatformTiming> m_timing; | 112 OwnPtr<PlatformTiming> m_timing; |
111 | 113 |
(...skipping 17 matching lines...) Expand all Loading... | |
129 Timer<DocumentTimelineTiming> m_timer; | 131 Timer<DocumentTimelineTiming> m_timer; |
130 | 132 |
131 }; | 133 }; |
132 | 134 |
133 friend class AnimationDocumentTimelineTest; | 135 friend class AnimationDocumentTimelineTest; |
134 }; | 136 }; |
135 | 137 |
136 } // namespace | 138 } // namespace |
137 | 139 |
138 #endif | 140 #endif |
OLD | NEW |