diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-02 12:33:57 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-02 12:33:57 -0700 |
commit | 307844a8c17aedc369388baf4d98b0f82c3b695b (patch) | |
tree | 4eb0f901ba83f23788c6d97a441f28860b272eed /components/script/dom/htmliframeelement.rs | |
parent | c47b7944b03febb624ee36654e2e2cc2d20fb783 (diff) | |
parent | ed678cb7f13d7b7914c0a0d13eed47304d11aa01 (diff) | |
download | servo-307844a8c17aedc369388baf4d98b0f82c3b695b.tar.gz servo-307844a8c17aedc369388baf4d98b0f82c3b695b.zip |
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 -->
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
-rw-r--r-- | components/script/dom/htmliframeelement.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index f279c2cff79..2c71488c5dc 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; bitflags! { #[derive(JSTraceable, HeapSizeOf)] @@ -360,6 +361,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) => { |