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/base/MultipartBlobImpl.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/base/MultipartBlobImpl.cpp')
| -rwxr-xr-x[-rw-r--r--] | dom/base/MultipartBlobImpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dom/base/MultipartBlobImpl.cpp b/dom/base/MultipartBlobImpl.cpp index ba26d07f9..03bb62add 100644..100755 --- a/dom/base/MultipartBlobImpl.cpp +++ b/dom/base/MultipartBlobImpl.cpp @@ -17,6 +17,7 @@ #include "nsContentUtils.h" #include "nsIScriptError.h" #include "nsIXPConnect.h" +#include "mozilla/TimerClamping.h" #include <algorithm> using namespace mozilla; @@ -270,8 +271,7 @@ MultipartBlobImpl::SetLengthAndModifiedDate(ErrorResult& aRv) // var x = new Date(); var f = new File(...); // x.getTime() < f.dateModified.getTime() // could fail. - mLastModificationDate = - lastModifiedSet ? lastModified * PR_USEC_PER_MSEC : JS_Now(); + mLastModificationDate = TimerClamping::ReduceUsTimeValue(lastModifiedSet ? lastModified * PR_USEC_PER_MSEC : JS_Now()); } } |