diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebCore/html/MediaController.cpp | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebCore/html/MediaController.cpp')
| -rw-r--r-- | Source/WebCore/html/MediaController.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebCore/html/MediaController.cpp b/Source/WebCore/html/MediaController.cpp index 806af55b9..bba6f0310 100644 --- a/Source/WebCore/html/MediaController.cpp +++ b/Source/WebCore/html/MediaController.cpp @@ -142,8 +142,9 @@ float MediaController::currentTime() const { if (m_mediaElements.isEmpty()) return 0; - - return m_clock->currentTime(); + + // Some clocks may return times outside the range of [0..duration]. + return max(0.0f, min(duration(), m_clock->currentTime())); } void MediaController::setCurrentTime(float time, ExceptionCode& code) |