Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Side by Side Diff: Source/core/animation/Player.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/animation/KeyframeEffectModel.cpp ('k') | Source/core/animation/PlayerTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « Source/core/animation/KeyframeEffectModel.cpp ('k') | Source/core/animation/PlayerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698