aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/performance.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2014-12-15 20:00:53 -0700
committerbors-servo <metajack+bors@gmail.com>2014-12-15 20:00:53 -0700
commite0ec21e814f07601fa3e5e2ec04de7c7a0fd7893 (patch)
treee404a24400d7bcb66b1460c5aad849abbd287c26 /components/script/dom/performance.rs
parent8e31e5f98747e4b42dafcc4b076fac46aeb09310 (diff)
parenteec68faa41dbe783cfba3fd92e6094629c126427 (diff)
downloadservo-e0ec21e814f07601fa3e5e2ec04de7c7a0fd7893.tar.gz
servo-e0ec21e814f07601fa3e5e2ec04de7c7a0fd7893.zip
auto merge of #4381 : Manishearth/servo/performancenow, r=jdm
Diffstat (limited to 'components/script/dom/performance.rs')
-rw-r--r--components/script/dom/performance.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/dom/performance.rs b/components/script/dom/performance.rs
index 60f5abfec95..3fc094eeb65 100644
--- a/components/script/dom/performance.rs
+++ b/components/script/dom/performance.rs
@@ -47,9 +47,10 @@ impl<'a> PerformanceMethods for JSRef<'a, Performance> {
Temporary::new(self.timing.clone())
}
+ // https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/HighResolutionTime/Overview.html#dom-performance-now
fn Now(self) -> DOMHighResTimeStamp {
- let navStart = self.timing.root().NavigationStartPrecise() as f64;
- (time::precise_time_s() - navStart) as DOMHighResTimeStamp
+ let navStart = self.timing.root().NavigationStartPrecise();
+ (time::precise_time_ns() as f64 - navStart) * 1000000u as DOMHighResTimeStamp
}
}