| 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 10 matching lines...) Expand all Loading... |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "sky/engine/config.h" |
| 32 #include "core/animation/ActiveAnimations.h" | 32 #include "sky/engine/core/animation/ActiveAnimations.h" |
| 33 | 33 |
| 34 #include "core/rendering/RenderObject.h" | 34 #include "sky/engine/core/rendering/RenderObject.h" |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| 38 ActiveAnimations::~ActiveAnimations() | 38 ActiveAnimations::~ActiveAnimations() |
| 39 { | 39 { |
| 40 for (size_t i = 0; i < m_animations.size(); ++i) | 40 for (size_t i = 0; i < m_animations.size(); ++i) |
| 41 m_animations[i]->notifyElementDestroyed(); | 41 m_animations[i]->notifyElementDestroyed(); |
| 42 m_animations.clear(); | 42 m_animations.clear(); |
| 43 } | 43 } |
| 44 | 44 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 68 style.setIsRunningFilterAnimationOnCompositor(m_defaultStack.hasActiveAn
imationsOnCompositor(CSSPropertyWebkitFilter)); | 68 style.setIsRunningFilterAnimationOnCompositor(m_defaultStack.hasActiveAn
imationsOnCompositor(CSSPropertyWebkitFilter)); |
| 69 } | 69 } |
| 70 | 70 |
| 71 void ActiveAnimations::cancelAnimationOnCompositor() | 71 void ActiveAnimations::cancelAnimationOnCompositor() |
| 72 { | 72 { |
| 73 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) |
| 74 it->key->cancelAnimationOnCompositor(); | 74 it->key->cancelAnimationOnCompositor(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 } // namespace blink | 77 } // namespace blink |
| OLD | NEW |