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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 return m_content->timeToReverseEffectChange() / abs(m_playbackRate); | 289 return m_content->timeToReverseEffectChange() / abs(m_playbackRate); |
290 } | 290 } |
291 | 291 |
292 void Player::cancel() | 292 void Player::cancel() |
293 { | 293 { |
294 if (!m_content) | 294 if (!m_content) |
295 return; | 295 return; |
296 | 296 |
297 ASSERT(m_content->player() == this); | 297 ASSERT(m_content->player() == this); |
298 m_content->detach(); | 298 m_content->detach(); |
299 m_content = 0; | 299 m_content = nullptr; |
300 } | 300 } |
301 | 301 |
302 void Player::pauseForTesting(double pauseTime) | 302 void Player::pauseForTesting(double pauseTime) |
303 { | 303 { |
304 RELEASE_ASSERT(!paused()); | 304 RELEASE_ASSERT(!paused()); |
305 updateTimingState(pauseTime); | 305 updateTimingState(pauseTime); |
306 if (!m_isPausedForTesting && hasActiveAnimationsOnCompositor()) | 306 if (!m_isPausedForTesting && hasActiveAnimationsOnCompositor()) |
307 toAnimation(m_content.get())->pauseAnimationForTestingOnCompositor(curre
ntTime()); | 307 toAnimation(m_content.get())->pauseAnimationForTestingOnCompositor(curre
ntTime()); |
308 m_isPausedForTesting = true; | 308 m_isPausedForTesting = true; |
309 pause(); | 309 pause(); |
310 } | 310 } |
311 | 311 |
312 } // namespace | 312 } // namespace |
OLD | NEW |