| 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 blink { | 36 namespace blink { |
| 37 | 37 |
| 38 ActiveAnimations::~ActiveAnimations() | 38 ActiveAnimations::~ActiveAnimations() |
| 39 { | 39 { |
| 40 #if !ENABLE(OILPAN) | |
| 41 for (size_t i = 0; i < m_animations.size(); ++i) | 40 for (size_t i = 0; i < m_animations.size(); ++i) |
| 42 m_animations[i]->notifyElementDestroyed(); | 41 m_animations[i]->notifyElementDestroyed(); |
| 43 m_animations.clear(); | 42 m_animations.clear(); |
| 44 #endif | |
| 45 } | 43 } |
| 46 | 44 |
| 47 void ActiveAnimations::updateAnimationFlags(RenderStyle& style) | 45 void ActiveAnimations::updateAnimationFlags(RenderStyle& style) |
| 48 { | 46 { |
| 49 for (AnimationPlayerCountedSet::const_iterator it = m_players.begin(); it !=
m_players.end(); ++it) { | 47 for (AnimationPlayerCountedSet::const_iterator it = m_players.begin(); it !=
m_players.end(); ++it) { |
| 50 const AnimationPlayer& player = *it->key; | 48 const AnimationPlayer& player = *it->key; |
| 51 ASSERT(player.source()); | 49 ASSERT(player.source()); |
| 52 // FIXME: Needs to consider AnimationGroup once added. | 50 // FIXME: Needs to consider AnimationGroup once added. |
| 53 ASSERT(player.source()->isAnimation()); | 51 ASSERT(player.source()->isAnimation()); |
| 54 const Animation& animation = *toAnimation(player.source()); | 52 const Animation& animation = *toAnimation(player.source()); |
| (...skipping 16 matching lines...) Expand all Loading... |
| 71 } | 69 } |
| 72 | 70 |
| 73 void ActiveAnimations::cancelAnimationOnCompositor() | 71 void ActiveAnimations::cancelAnimationOnCompositor() |
| 74 { | 72 { |
| 75 for (AnimationPlayerCountedSet::iterator it = m_players.begin(); it != m_pla
yers.end(); ++it) | 73 for (AnimationPlayerCountedSet::iterator it = m_players.begin(); it != m_pla
yers.end(); ++it) |
| 76 it->key->cancelAnimationOnCompositor(); | 74 it->key->cancelAnimationOnCompositor(); |
| 77 } | 75 } |
| 78 | 76 |
| 79 void ActiveAnimations::trace(Visitor* visitor) | 77 void ActiveAnimations::trace(Visitor* visitor) |
| 80 { | 78 { |
| 81 #if ENABLE(OILPAN) | |
| 82 visitor->trace(m_cssAnimations); | |
| 83 visitor->trace(m_defaultStack); | |
| 84 visitor->trace(m_players); | |
| 85 #endif | |
| 86 } | 79 } |
| 87 | 80 |
| 88 } // namespace blink | 81 } // namespace blink |
| OLD | NEW |