aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-06-05 11:46:48 -0500
committerbors-servo <metajack+bors@gmail.com>2015-06-05 11:46:48 -0500
commit458a5324618b8e58565d686fdea3363a31e11973 (patch)
treec65fbae75f28bb7067663b2d7b7066edde0c1855 /components
parent0a93ed26e85319fe217a706be52cdb9e4060120f (diff)
parent1612f723a89a44dd12d833ec7cc97f2473df02c6 (diff)
downloadservo-458a5324618b8e58565d686fdea3363a31e11973.tar.gz
servo-458a5324618b8e58565d686fdea3363a31e11973.zip
Auto merge of #6292 - Wafflespeanut:timestamp, r=jdm
Changed the operator and updated the wpt-test for `hr-time`. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6292) <!-- Reviewable:end -->
Diffstat (limited to 'components')
-rw-r--r--components/script/dom/performance.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/performance.rs b/components/script/dom/performance.rs
index d9dd8472d74..dcb5dd290e9 100644
--- a/components/script/dom/performance.rs
+++ b/components/script/dom/performance.rs
@@ -51,7 +51,7 @@ impl<'a> PerformanceMethods for JSRef<'a, Performance> {
// 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().r().NavigationStartPrecise();
- let now = (time::precise_time_ns() as f64 - navStart) * 1000000 as f64;
+ let now = (time::precise_time_ns() as f64 - navStart) / 1000000 as f64;
Finite::wrap(now)
}
}