diff options
Diffstat (limited to 'components')
-rw-r--r-- | components/script/dom/htmliframeelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/webidls/BrowserElement.webidl | 1 | ||||
-rw-r--r-- | components/servo/main.rs | 3 | ||||
-rw-r--r-- | components/util/lib.rs | 4 |
4 files changed, 9 insertions, 1 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 3c5377b8c98..687867466e7 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -49,6 +49,7 @@ use style::attr::{AttrValue, LengthOrPercentageOrAuto}; use style::context::ReflowGoal; use url::Url; use util::prefs::mozbrowser_enabled; +use util::servo_version; #[derive(HeapSizeOf)] enum SandboxAllowance { @@ -358,6 +359,7 @@ impl MozBrowserEventDetailBuilder for HTMLIFrameElement { type_: Some(DOMString::from(error_type.name())), description: description.map(DOMString::from), report: report.map(DOMString::from), + version: Some(DOMString::from_string(servo_version().into())), }.to_jsval(cx, rval); }, MozBrowserEvent::SecurityChange(https_state) => { diff --git a/components/script/dom/webidls/BrowserElement.webidl b/components/script/dom/webidls/BrowserElement.webidl index 6105811666b..44790d33070 100644 --- a/components/script/dom/webidls/BrowserElement.webidl +++ b/components/script/dom/webidls/BrowserElement.webidl @@ -61,6 +61,7 @@ dictionary BrowserElementErrorEventDetail { DOMString type; DOMString description; DOMString report; + DOMString version; }; dictionary BrowserElementLocationChangeEventDetail { diff --git a/components/servo/main.rs b/components/servo/main.rs index ca0eec17955..66f5a149158 100644 --- a/components/servo/main.rs +++ b/components/servo/main.rs @@ -40,6 +40,7 @@ use servo::Browser; use servo::compositing::windowing::WindowEvent; use servo::util::opts::{self, ArgumentParsingResult}; use servo::util::panicking::initiate_panic_hook; +use servo::util::servo_version; use std::process; use std::rc::Rc; @@ -104,7 +105,7 @@ fn main() { } if opts::get().is_printing_version { - println!("Servo {}{}", env!("CARGO_PKG_VERSION"), env!("GIT_INFO")); + println!("{}", servo_version()); process::exit(0); } diff --git a/components/util/lib.rs b/components/util/lib.rs index eb71fdf41f1..84c86a982ed 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -64,3 +64,7 @@ pub fn arc_ptr_eq<T: 'static>(a: &Arc<T>, b: &Arc<T>) -> bool { let b: &T = &**b; (a as *const T) == (b as *const T) } + +pub fn servo_version() -> &'static str { + concat!("Servo ", env!("CARGO_PKG_VERSION"), env!("GIT_INFO")) +} |