summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-29 12:35:55 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-29 12:35:55 +0200
commiteeaf0a73acf661662b9baf9929c9688c60d0bf38 (patch)
treeef7ef4082282eb967220c1493c07084c97cfc7c0
parent089a0bd9a4dace03e5800878055b86854eee5002 (diff)
downloadUXP-eeaf0a73acf661662b9baf9929c9688c60d0bf38.tar
UXP-eeaf0a73acf661662b9baf9929c9688c60d0bf38.tar.gz
UXP-eeaf0a73acf661662b9baf9929c9688c60d0bf38.tar.lz
UXP-eeaf0a73acf661662b9baf9929c9688c60d0bf38.tar.xz
UXP-eeaf0a73acf661662b9baf9929c9688c60d0bf38.zip
Bug 1322292 - Some fixes for the Performance API in workers - part 3 - TimeStampToDOMHighRes() in workerPrivate
https://hg.mozilla.org/mozilla-central/rev/b827e4d0dc73
-rwxr-xr-xdom/console/Console.cpp5
-rwxr-xr-xdom/events/Event.cpp6
-rw-r--r--dom/workers/WorkerPrivate.h7
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
{