mirror of
https://github.com/servo/servo.git
synced 2025-07-24 15:50:21 +01:00
Auto merge of #12136 - ConnorGBrewster:servo_version_reporter, r=asajeffrey
Send servo version in mozbrowser error. <!-- Please describe your changes on the following line: --> Adds support for sending a version string to b.html so we can put the servo version in the auto generated issue reports. r? @asajeffrey --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #12083 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because sending servo version on mozbrwosererror for issue reporter. <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12136) <!-- Reviewable:end -->
This commit is contained in:
commit
307844a8c1
4 changed files with 9 additions and 1 deletions
|
@ -49,6 +49,7 @@ use style::attr::{AttrValue, LengthOrPercentageOrAuto};
|
||||||
use style::context::ReflowGoal;
|
use style::context::ReflowGoal;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
use util::prefs::mozbrowser_enabled;
|
use util::prefs::mozbrowser_enabled;
|
||||||
|
use util::servo_version;
|
||||||
|
|
||||||
bitflags! {
|
bitflags! {
|
||||||
#[derive(JSTraceable, HeapSizeOf)]
|
#[derive(JSTraceable, HeapSizeOf)]
|
||||||
|
@ -360,6 +361,7 @@ impl MozBrowserEventDetailBuilder for HTMLIFrameElement {
|
||||||
type_: Some(DOMString::from(error_type.name())),
|
type_: Some(DOMString::from(error_type.name())),
|
||||||
description: description.map(DOMString::from),
|
description: description.map(DOMString::from),
|
||||||
report: report.map(DOMString::from),
|
report: report.map(DOMString::from),
|
||||||
|
version: Some(DOMString::from_string(servo_version().into())),
|
||||||
}.to_jsval(cx, rval);
|
}.to_jsval(cx, rval);
|
||||||
},
|
},
|
||||||
MozBrowserEvent::SecurityChange(https_state) => {
|
MozBrowserEvent::SecurityChange(https_state) => {
|
||||||
|
|
|
@ -61,6 +61,7 @@ dictionary BrowserElementErrorEventDetail {
|
||||||
DOMString type;
|
DOMString type;
|
||||||
DOMString description;
|
DOMString description;
|
||||||
DOMString report;
|
DOMString report;
|
||||||
|
DOMString version;
|
||||||
};
|
};
|
||||||
|
|
||||||
dictionary BrowserElementLocationChangeEventDetail {
|
dictionary BrowserElementLocationChangeEventDetail {
|
||||||
|
|
|
@ -40,6 +40,7 @@ use servo::Browser;
|
||||||
use servo::compositing::windowing::WindowEvent;
|
use servo::compositing::windowing::WindowEvent;
|
||||||
use servo::util::opts::{self, ArgumentParsingResult};
|
use servo::util::opts::{self, ArgumentParsingResult};
|
||||||
use servo::util::panicking::initiate_panic_hook;
|
use servo::util::panicking::initiate_panic_hook;
|
||||||
|
use servo::util::servo_version;
|
||||||
use std::process;
|
use std::process;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
|
||||||
|
@ -104,7 +105,7 @@ fn main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
if opts::get().is_printing_version {
|
if opts::get().is_printing_version {
|
||||||
println!("Servo {}{}", env!("CARGO_PKG_VERSION"), env!("GIT_INFO"));
|
println!("{}", servo_version());
|
||||||
process::exit(0);
|
process::exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -64,3 +64,7 @@ pub fn arc_ptr_eq<T: 'static>(a: &Arc<T>, b: &Arc<T>) -> bool {
|
||||||
let b: &T = &**b;
|
let b: &T = &**b;
|
||||||
(a as *const T) == (b as *const T)
|
(a as *const T) == (b as *const T)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn servo_version() -> &'static str {
|
||||||
|
concat!("Servo ", env!("CARGO_PKG_VERSION"), env!("GIT_INFO"))
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue