diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-12-15 20:00:53 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-12-15 20:00:53 -0700 |
| commit | e0ec21e814f07601fa3e5e2ec04de7c7a0fd7893 (patch) | |
| tree | e404a24400d7bcb66b1460c5aad849abbd287c26 | |
| parent | 8e31e5f98747e4b42dafcc4b076fac46aeb09310 (diff) | |
| parent | eec68faa41dbe783cfba3fd92e6094629c126427 (diff) | |
| download | servo-e0ec21e814f07601fa3e5e2ec04de7c7a0fd7893.tar.gz servo-e0ec21e814f07601fa3e5e2ec04de7c7a0fd7893.zip | |
auto merge of #4381 : Manishearth/servo/performancenow, r=jdm
| -rw-r--r-- | components/script/dom/performance.rs | 5 | ||||
| -rw-r--r-- | components/script/dom/window.rs | 2 |
2 files changed, 4 insertions, 3 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 } } diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index f305bf1344c..be5d8ad35b2 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -382,7 +382,7 @@ impl Window { browser_context: DOMRefCell::new(None), performance: Default::default(), navigation_start: time::get_time().sec as u64, - navigation_start_precise: time::precise_time_s(), + navigation_start_precise: time::precise_time_ns() as f64, screen: Default::default(), session_storage: Default::default(), timers: TimerManager::new() |