auto merge of #4381 : Manishearth/servo/performancenow, r=jdm

This commit is contained in:
bors-servo 2014-12-15 20:00:53 -07:00
commit e0ec21e814
2 changed files with 4 additions and 3 deletions

View file

@ -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()