| 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 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "core/animation/ActiveAnimations.h" | 32 #include "core/animation/ActiveAnimations.h" |
| 33 | 33 |
| 34 #include "core/rendering/RenderObject.h" | 34 #include "core/rendering/RenderObject.h" |
| 35 | 35 |
| 36 namespace WebCore { | 36 namespace WebCore { |
| 37 | 37 |
| 38 ActiveAnimations::~ActiveAnimations() | 38 ActiveAnimations::~ActiveAnimations() |
| 39 { | 39 { |
| 40 } | |
| 41 | |
| 42 void ActiveAnimations::dispose() | |
| 43 { | |
| 44 for (size_t i = 0; i < m_animations.size(); ++i) | 40 for (size_t i = 0; i < m_animations.size(); ++i) |
| 45 m_animations[i]->notifyElementDestroyed(); | 41 m_animations[i]->notifyElementDestroyed(); |
| 46 m_animations.clear(); | 42 m_animations.clear(); |
| 47 } | 43 } |
| 48 | 44 |
| 49 void ActiveAnimations::addPlayer(AnimationPlayer* player) | 45 void ActiveAnimations::addPlayer(AnimationPlayer* player) |
| 50 { | 46 { |
| 51 ++m_players.add(player, 0).storedValue->value; | 47 ++m_players.add(player, 0).storedValue->value; |
| 52 } | 48 } |
| 53 | 49 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 85 |
| 90 void ActiveAnimations::cancelAnimationOnCompositor() | 86 void ActiveAnimations::cancelAnimationOnCompositor() |
| 91 { | 87 { |
| 92 for (AnimationPlayerCountedSet::iterator it = m_players.begin(); it != m_pla
yers.end(); ++it) | 88 for (AnimationPlayerCountedSet::iterator it = m_players.begin(); it != m_pla
yers.end(); ++it) |
| 93 it->key->cancelAnimationOnCompositor(); | 89 it->key->cancelAnimationOnCompositor(); |
| 94 } | 90 } |
| 95 | 91 |
| 96 void ActiveAnimations::trace(Visitor* visitor) | 92 void ActiveAnimations::trace(Visitor* visitor) |
| 97 { | 93 { |
| 98 visitor->trace(m_cssAnimations); | 94 visitor->trace(m_cssAnimations); |
| 95 #if ENABLE(OILPAN) |
| 96 visitor->trace(m_target); |
| 97 #endif |
| 99 } | 98 } |
| 100 | 99 |
| 101 } // namespace WebCore | 100 } // namespace WebCore |
| OLD | NEW |