auto merge of #4332 : Ms2ger/servo/performance, r=jdm

3 files changed, 22 insertions, 16 deletions

diff --git a/components/script/dom/performance.rs b/components/script/dom/performance.rs
index 806bad196ec..60f5abfec95 100644
--- a/components/script/dom/performance.rs
+++ b/components/script/dom/performance.rs
@@ -20,15 +20,23 @@ pub struct Performance {
 }
 
 impl Performance {
-    fn new_inherited(window: JSRef<Window>) -> Performance {
+    fn new_inherited(window: JSRef<Window>,
+                     navigation_start: u64,
+                     navigation_start_precise: f64) -> Performance {
         Performance {
             reflector_: Reflector::new(),
-            timing: JS::from_rooted(PerformanceTiming::new(window)),
+            timing: JS::from_rooted(PerformanceTiming::new(window,
+                                                           navigation_start,
+                                                           navigation_start_precise)),
         }
     }
 
-    pub fn new(window: JSRef<Window>) -> Temporary<Performance> {
-        reflect_dom_object(box Performance::new_inherited(window),
+    pub fn new(window: JSRef<Window>,
+               navigation_start: u64,
+               navigation_start_precise: f64) -> Temporary<Performance> {
+        reflect_dom_object(box Performance::new_inherited(window,
+                                                          navigation_start,
+                                                          navigation_start_precise),
                            global::Window(window),
                            PerformanceBinding::Wrap)
     }
diff --git a/components/script/dom/performancetiming.rs b/components/script/dom/performancetiming.rs
index 1b409aabe23..3dbffabbb3a 100644
--- a/components/script/dom/performancetiming.rs
+++ b/components/script/dom/performancetiming.rs
@@ -27,9 +27,12 @@ impl PerformanceTiming {
     }
 
     #[allow(unrooted_must_root)]
-    pub fn new(window: JSRef<Window>) -> Temporary<PerformanceTiming> {
-        let timing = PerformanceTiming::new_inherited(window.navigation_start(),
-                                                      window.navigation_start_precise());
+    pub fn new(window: JSRef<Window>,
+               navigation_start: u64,
+               navigation_start_precise: f64)
+               -> Temporary<PerformanceTiming> {
+        let timing = PerformanceTiming::new_inherited(navigation_start,
+                                                      navigation_start_precise);
         reflect_dom_object(box timing, global::Window(window),
                            PerformanceTimingBinding::Wrap)
     }
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index da0cc228b0a..ec12d983918 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -98,14 +98,6 @@ impl Window {
         &*self.page
     }
 
-    pub fn navigation_start(&self) -> u64 {
-        self.navigation_start
-    }
-
-    pub fn navigation_start_precise(&self) -> f64 {
-        self.navigation_start_precise
-    }
-
     pub fn get_url(&self) -> Url {
         self.page().get_url()
     }
@@ -267,7 +259,10 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
     }
 
     fn Performance(self) -> Temporary<Performance> {
-        self.performance.or_init(|| Performance::new(self))
+        self.performance.or_init(|| {
+            Performance::new(self, self.navigation_start,
+                             self.navigation_start_precise)
+        })
     }
 
     global_event_handlers!()