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/console | |
| 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/console')
| -rwxr-xr-x[-rw-r--r--] | dom/console/Console.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dom/console/Console.cpp b/dom/console/Console.cpp index 9ede26501..79e3eadc5 100644..100755 --- a/dom/console/Console.cpp +++ b/dom/console/Console.cpp @@ -30,6 +30,7 @@ #include "nsContentUtils.h" #include "nsDocShell.h" #include "nsProxyRelease.h" +#include "mozilla/TimerClamping.h" #include "mozilla/ConsoleTimelineMarker.h" #include "mozilla/TimestampTimelineMarker.h" @@ -1338,7 +1339,7 @@ Console::MethodInternal(JSContext* aCx, MethodName aMethodName, TimeDuration duration = mozilla::TimeStamp::Now() - workerPrivate->NowBaseTimeStamp(); - monotonicTimer = duration.ToMilliseconds(); + monotonicTimer = TimerClamping::ReduceMsTimeValue(duration.ToMilliseconds()); } } |