From 67df248e7600f16673d6fc2385fe07b429001873 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 30 Aug 2014 00:56:35 -0400
Subject: [PATCH] Bug 908390 followup.  Fix up event timestamps on workers, and
 enable the test that was supposed to test for it.  r=khuey pending

---
 dom/events/Event.cpp                     |  8 +++-----
 dom/events/test/test_eventTimeStamp.html | 18 ++++++------------
 dom/workers/WorkerPrivate.cpp            |  6 +++---
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/dom/events/Event.cpp b/dom/events/Event.cpp
index e0e53496bcb0..ff96b4acfde6 100644
--- a/dom/events/Event.cpp
+++ b/dom/events/Event.cpp
@@ -997,16 +997,14 @@ Event::TimeStamp() const
   }
 
   // For dedicated workers, we should make times relative to the navigation
-  // start of the document that created the worker. We currently don't have
-  // that information handy so for now we treat shared workers and dedicated
-  // workers alike and make times relative to the worker creation time. We can
-  // fix this when we implement WorkerPerformance.
+  // start of the document that created the worker, which is the same as the
+  // timebase for performance.now().
   workers::WorkerPrivate* workerPrivate =
     workers::GetCurrentThreadWorkerPrivate();
   MOZ_ASSERT(workerPrivate);
 
   TimeDuration duration =
-    mEvent->timeStamp - workerPrivate->CreationTimeStamp();
+    mEvent->timeStamp - workerPrivate->NowBaseTimeStamp();
   return duration.ToMilliseconds();
 }
 
diff --git a/dom/events/test/test_eventTimeStamp.html b/dom/events/test/test_eventTimeStamp.html
index ccb15cd7f8a7..bcf1bcb8d4c7 100644
--- a/dom/events/test/test_eventTimeStamp.html
+++ b/dom/events/test/test_eventTimeStamp.html
@@ -16,14 +16,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=77992
 <pre id="test">
 <script type="text/js-worker" id="worker-src">
   // Simply returns the event timestamp
-  // (Since we know that this isn't implemented correctly for dedicated workers
-  //  and isn't likely to be implemented correctly until we implement
-  //  WorkerPerformance, we make this return the *wrong* result so long as
-  //  'performance' is not available. Then we can use this in a todo() test
-  //  below and when we come to implement WorkerPerformance the todo() check
-  //  should fail reminding us to update this test.)
   onmessage = function(evt) {
-    postMessage(typeof performance === "object" ? evt.timeStamp : 0);
+    postMessage(evt.timeStamp);
   }
 </script>
 <script type="text/js-worker" id="shared-worker-src">
@@ -79,11 +73,11 @@ function testWorkerEvents() {
   var worker = new Worker(window.URL.createObjectURL(blob));
   worker.onmessage = function(evt) {
     var timeAfterEvent = window.performance.now();
-    todo(evt.data > timeBeforeEvent &&
-         evt.data < timeAfterEvent,
-         "Event timestamp in dedicated worker (" + evt.data +
-           ") is in expected range: (" +
-           timeBeforeEvent + ", " + timeAfterEvent + ")");
+    ok(evt.data > timeBeforeEvent &&
+       evt.data < timeAfterEvent,
+       "Event timestamp in dedicated worker (" + evt.data +
+         ") is in expected range: (" +
+         timeBeforeEvent + ", " + timeAfterEvent + ")");
     worker.terminate();
     testSharedWorkerEvents();
   };
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index b0c5e71174f1..19c0cc4b66cd 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -2137,9 +2137,9 @@ WorkerPrivateParent<Derived>::WorkerPrivateParent(
 
     RuntimeService::GetDefaultJSSettings(mJSSettings);
 
-    if (IsDedicatedWorker() && aLoadInfo.mWindow &&
-        aLoadInfo.mWindow->GetPerformance()) {
-      mNowBaseTimeStamp = aLoadInfo.mWindow->GetPerformance()->GetDOMTiming()->
+    if (IsDedicatedWorker() && mLoadInfo.mWindow &&
+        mLoadInfo.mWindow->GetPerformance()) {
+      mNowBaseTimeStamp = mLoadInfo.mWindow->GetPerformance()->GetDOMTiming()->
         GetNavigationStartTimeStamp();
     } else {
       mNowBaseTimeStamp = CreationTimeStamp();