| 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 { | 174 { |
| 175 return m_effect && m_effect->affects(property); | 175 return m_effect && m_effect->affects(property); |
| 176 } | 176 } |
| 177 | 177 |
| 178 void Animation::cancelAnimationOnCompositor() | 178 void Animation::cancelAnimationOnCompositor() |
| 179 { | 179 { |
| 180 if (!hasActiveAnimationsOnCompositor()) | 180 if (!hasActiveAnimationsOnCompositor()) |
| 181 return; | 181 return; |
| 182 if (!m_target || !m_target->renderer()) | 182 if (!m_target || !m_target->renderer()) |
| 183 return; | 183 return; |
| 184 for (size_t i = 0; i < m_compositorAnimationIds.size(); ++i) { | 184 for (size_t i = 0; i < m_compositorAnimationIds.size(); ++i) |
| 185 CompositorAnimations::instance()->cancelAnimationOnCompositor(*m_target.
get(), m_compositorAnimationIds[i]); | 185 CompositorAnimations::instance()->cancelAnimationOnCompositor(*m_target.
get(), m_compositorAnimationIds[i]); |
| 186 } | |
| 187 m_compositorAnimationIds.clear(); | 186 m_compositorAnimationIds.clear(); |
| 188 } | 187 } |
| 189 | 188 |
| 190 void Animation::pauseAnimationForTestingOnCompositor(double pauseTime) | 189 void Animation::pauseAnimationForTestingOnCompositor(double pauseTime) |
| 191 { | 190 { |
| 192 ASSERT(hasActiveAnimationsOnCompositor()); | 191 ASSERT(hasActiveAnimationsOnCompositor()); |
| 193 if (!m_target || !m_target->renderer()) | 192 if (!m_target || !m_target->renderer()) |
| 194 return; | 193 return; |
| 195 for (size_t i = 0; i < m_compositorAnimationIds.size(); ++i) | 194 for (size_t i = 0; i < m_compositorAnimationIds.size(); ++i) |
| 196 CompositorAnimations::instance()->pauseAnimationForTestingOnCompositor(*
m_target.get(), m_compositorAnimationIds[i], pauseTime); | 195 CompositorAnimations::instance()->pauseAnimationForTestingOnCompositor(*
m_target.get(), m_compositorAnimationIds[i], pauseTime); |
| 197 } | 196 } |
| 198 | 197 |
| 199 } // namespace WebCore | 198 } // namespace WebCore |
| OLD | NEW |