diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-03-05 15:02:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-05 15:02:24 -0500 |
commit | 55347aa39f272b5b3fc7ede6403f70aa49d31ce1 (patch) | |
tree | 9800b12cc4486be490958d1ade8021ddd80d3391 /components/servo/lib.rs | |
parent | cc131be2e0f48924ffc8cdfc017fc23c361f1140 (diff) | |
parent | cc2d20315149887ee1f125deac1a1807722a50ee (diff) | |
download | servo-55347aa39f272b5b3fc7ede6403f70aa49d31ce1.tar.gz servo-55347aa39f272b5b3fc7ede6403f70aa49d31ce1.zip |
Auto merge of #22953 - asajeffrey:webvr-glwindow, r=paulrouget
Use a test VRDisplay that renders to a GL window
<!-- Please describe your changes on the following line: -->
Add a `dom.webvr.test` pref that registers a new VR display, which registers to a GL window.
The matching webvr PR is https://github.com/servo/rust-webvr/pull/66.
---
<!-- 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 #22795
- [X] These changes do not require tests because we need a followup PR to support reftests which use the VR display
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- 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="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22953)
<!-- Reviewable:end -->
Diffstat (limited to 'components/servo/lib.rs')
-rw-r--r-- | components/servo/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 95a02c25afc..cc3a7c849c2 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -258,10 +258,11 @@ where // can't defer it after `create_constellation` has started. script::init(); + let mut webvr_heartbeats = Vec::new(); let webvr_services = if PREFS.is_webvr_enabled() { let mut services = VRServiceManager::new(); services.register_defaults(); - window.register_vr_services(&mut services); + window.register_vr_services(&mut services, &mut webvr_heartbeats); Some(services) } else { None @@ -308,6 +309,7 @@ where webrender, webrender_document, webrender_api, + webvr_heartbeats, }, ); |