summaryrefslogtreecommitdiffstats
path: root/dom/console
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-29 12:32:19 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-29 12:32:19 +0200
commit089a0bd9a4dace03e5800878055b86854eee5002 (patch)
tree397cdb4e36128e6d80e71db3cb18588b1147aab8 /dom/console
parent85a83305dd0caeb484687cf511f81024a683338b (diff)
downloadUXP-089a0bd9a4dace03e5800878055b86854eee5002.tar
UXP-089a0bd9a4dace03e5800878055b86854eee5002.tar.gz
UXP-089a0bd9a4dace03e5800878055b86854eee5002.tar.lz
UXP-089a0bd9a4dace03e5800878055b86854eee5002.tar.xz
UXP-089a0bd9a4dace03e5800878055b86854eee5002.zip
Bug 1322292 - Some fixes for the Performance API in workers - part 2 - Get rid of NowBaseTimeStamp()
https://hg.mozilla.org/mozilla-central/rev/301231f4165a
Diffstat (limited to 'dom/console')
-rwxr-xr-xdom/console/Console.cpp2
-rw-r--r--dom/console/Console.h10
2 files changed, 5 insertions, 7 deletions
diff --git a/dom/console/Console.cpp b/dom/console/Console.cpp
index 79e3eadc5..1ecf1f7fd 100755
--- a/dom/console/Console.cpp
+++ b/dom/console/Console.cpp
@@ -1337,7 +1337,7 @@ Console::MethodInternal(JSContext* aCx, MethodName aMethodName,
MOZ_ASSERT(workerPrivate);
TimeDuration duration =
- mozilla::TimeStamp::Now() - workerPrivate->NowBaseTimeStamp();
+ mozilla::TimeStamp::Now() - workerPrivate->CreationTimeStamp();
monotonicTimer = TimerClamping::ReduceMsTimeValue(duration.ToMilliseconds());
}
diff --git a/dom/console/Console.h b/dom/console/Console.h
index b334d79f9..2f375c8eb 100644
--- a/dom/console/Console.h
+++ b/dom/console/Console.h
@@ -258,9 +258,8 @@ private:
// the max number of timers is reached.
// * aCx - the JSContext rooting aName.
// * aName - this is (should be) the name of the timer as JS::Value.
- // * aTimestamp - the monotonicTimer for this context (taken from
- // window->performance.now() or from Now() -
- // workerPrivate->NowBaseTimeStamp() in workers.
+ // * aTimestamp - the monotonicTimer for this context taken from
+ // performance.now().
// * aTimerLabel - This label will be populated with the aName converted to a
// string.
// * aTimerValue - the StartTimer value stored into (or taken from)
@@ -290,9 +289,8 @@ private:
// the aName timer doesn't exist in the mTimerRegistry.
// * aCx - the JSContext rooting aName.
// * aName - this is (should be) the name of the timer as JS::Value.
- // * aTimestamp - the monotonicTimer for this context (taken from
- // window->performance.now() or from Now() -
- // workerPrivate->NowBaseTimeStamp() in workers.
+ // * aTimestamp - the monotonicTimer for this context taken from
+ // performance.now().
// * aTimerLabel - This label will be populated with the aName converted to a
// string.
// * aTimerDuration - the difference between aTimestamp and when the timer