From af548696bbd767c72d3f9e79188a05379ebd0f0e Mon Sep 17 00:00:00 2001 From: Gulshan Singh Date: Wed, 30 Apr 2014 13:34:53 -0400 Subject: [PATCH 1/2] Make TimeStamp in event.rs return the actual timestamp --- src/components/script/dom/event.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index ff6fa73fc10..b83f660a930 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -2,6 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +extern crate time; + use dom::bindings::codegen::EventBinding; use dom::bindings::codegen::EventBinding::EventConstants; use dom::bindings::js::JS; @@ -54,6 +56,7 @@ pub struct Event { pub trusted: bool, pub dispatching: bool, pub initialized: bool, + pub timestamp: u64, } impl Event { @@ -73,6 +76,7 @@ impl Event { stop_propagation: false, stop_immediate: false, initialized: false, + timestamp: time::get_time().sec as u64, } } @@ -126,7 +130,7 @@ impl Event { } pub fn TimeStamp(&self) -> u64 { - 0 + return self.timestamp; } pub fn InitEvent(&mut self, From b1f4e04ee220b6ff32a442253fee3bc2bd700f87 Mon Sep 17 00:00:00 2001 From: Gulshan Singh Date: Wed, 30 Apr 2014 14:08:38 -0400 Subject: [PATCH 2/2] Removed unnecessary return and moved crate import to script.rs --- src/components/script/dom/event.rs | 6 +++--- src/components/script/script.rs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index b83f660a930..12f34b734d3 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -2,8 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -extern crate time; - use dom::bindings::codegen::EventBinding; use dom::bindings::codegen::EventBinding::EventConstants; use dom::bindings::js::JS; @@ -15,6 +13,8 @@ use servo_util::str::DOMString; use geom::point::Point2D; +use time; + pub enum Event_ { ResizeEvent(uint, uint), ReflowEvent, @@ -130,7 +130,7 @@ impl Event { } pub fn TimeStamp(&self) -> u64 { - return self.timestamp; + self.timestamp } pub fn InitEvent(&mut self, diff --git a/src/components/script/script.rs b/src/components/script/script.rs index e72dc8af372..022b3b5e1a5 100644 --- a/src/components/script/script.rs +++ b/src/components/script/script.rs @@ -24,6 +24,7 @@ extern crate js; extern crate libc; extern crate native; extern crate serialize; +extern crate time; #[phase(syntax)] extern crate servo_macros = "macros"; extern crate servo_net = "net";