diff options
| -rwxr-xr-x | dom/console/Console.cpp | 5 | ||||
| -rwxr-xr-x | dom/events/Event.cpp | 6 | ||||
| -rw-r--r-- | dom/workers/WorkerPrivate.h | 7 |
3 files changed, 9 insertions, 9 deletions
diff --git a/dom/console/Console.cpp b/dom/console/Console.cpp index 1ecf1f7fd..ff5a92167 100755 --- a/dom/console/Console.cpp +++ b/dom/console/Console.cpp @@ -1336,10 +1336,7 @@ Console::MethodInternal(JSContext* aCx, MethodName aMethodName, WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate(); MOZ_ASSERT(workerPrivate); - TimeDuration duration = - mozilla::TimeStamp::Now() - workerPrivate->CreationTimeStamp(); - - monotonicTimer = TimerClamping::ReduceMsTimeValue(duration.ToMilliseconds()); + monotonicTimer = workerPrivate->TimeStampToDOMHighRes(TimeStamp::Now()); } } diff --git a/dom/events/Event.cpp b/dom/events/Event.cpp index 4e39675da..4b9776c0a 100755 --- a/dom/events/Event.cpp +++ b/dom/events/Event.cpp @@ -1146,15 +1146,11 @@ Event::TimeStampImpl() const return perf->GetDOMTiming()->TimeStampToDOMHighRes(mEvent->mTimeStamp); } - // For dedicated workers, we should make times relative to the creation time - // of the worker, which is the same as the timebase for performance.now(). workers::WorkerPrivate* workerPrivate = workers::GetCurrentThreadWorkerPrivate(); MOZ_ASSERT(workerPrivate); - TimeDuration duration = - mEvent->mTimeStamp - workerPrivate->CreationTimeStamp(); - return duration.ToMilliseconds(); + return workerPrivate->TimeStampToDOMHighRes(mEvent->mTimeStamp); } bool diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h index e15beb955..28283bed7 100644 --- a/dom/workers/WorkerPrivate.h +++ b/dom/workers/WorkerPrivate.h @@ -577,6 +577,13 @@ public: return mCreationTimeHighRes; } + DOMHighResTimeStamp TimeStampToDOMHighRes(const TimeStamp& aTimeStamp) const + { + MOZ_ASSERT(!aTimeStamp.IsNull()); + TimeDuration duration = aTimeStamp - mCreationTimeStamp; + return duration.ToMilliseconds(); + } + nsIPrincipal* GetPrincipal() const { |