diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-03-15 09:11:31 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-03-15 09:11:31 +0100 |
| commit | 82b361dc4463b13ebda30090e239db487f5aa308 (patch) | |
| tree | fdc6fd06e695188735d636da57b02b6c7e0c1c5f /dom/media/DOMMediaStream.cpp | |
| parent | 4bb98e2b61ce75d7f5d19398b658441a7ceed04b (diff) | |
| parent | 71429dc7ecc496c5924c770746e8c28449ecb7a2 (diff) | |
| download | UXP-82b361dc4463b13ebda30090e239db487f5aa308.tar UXP-82b361dc4463b13ebda30090e239db487f5aa308.tar.gz UXP-82b361dc4463b13ebda30090e239db487f5aa308.tar.lz UXP-82b361dc4463b13ebda30090e239db487f5aa308.tar.xz UXP-82b361dc4463b13ebda30090e239db487f5aa308.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'dom/media/DOMMediaStream.cpp')
| -rwxr-xr-x[-rw-r--r--] | dom/media/DOMMediaStream.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dom/media/DOMMediaStream.cpp b/dom/media/DOMMediaStream.cpp index 6794ee32f..c1d451035 100644..100755 --- a/dom/media/DOMMediaStream.cpp +++ b/dom/media/DOMMediaStream.cpp @@ -9,6 +9,7 @@ #include "nsIScriptError.h" #include "nsIUUIDGenerator.h" #include "nsPIDOMWindow.h" +#include "mozilla/TimerClamping.h" #include "mozilla/dom/MediaStreamBinding.h" #include "mozilla/dom/MediaStreamTrackEvent.h" #include "mozilla/dom/LocalMediaStreamBinding.h" @@ -544,8 +545,8 @@ DOMMediaStream::CurrentTime() if (!mPlaybackStream) { return 0.0; } - return mPlaybackStream-> - StreamTimeToSeconds(mPlaybackStream->GetCurrentTime() - mLogicalStreamStartTime); + return TimerClamping::ReduceSTimeValue(mPlaybackStream-> + StreamTimeToSeconds(mPlaybackStream->GetCurrentTime() - mLogicalStreamStartTime)); } void |