Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-01 03:30:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use initialized input sources in getInputSources()

Browse source
This commit is contained in:
Manish Goregaokar 2019-04-29 19:15:27 -07:00
parent 3a08e917e0
commit 5c8132c379
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/vrdisplay.rs
View file

@ -926,7 +926,7 @@ impl VRDisplay {
/// Initialize XRInputSources
fn initialize_inputs(&self) {
if self.initialized_inputs.get() {
return
return;
}
self.initialized_inputs.set(true);
@ -955,6 +955,15 @@ impl VRDisplay {
Err(_) => {},
}
}
pub fn get_input_sources(&self) -> Vec<DomRoot<XRInputSource>> {
self.initialize_inputs();
self.input_sources
.borrow()
.iter()
.map(|(_, x)| DomRoot::from_ref(&**x))
.collect()
}
}
// WebVR Spec: If the number of values in the leftBounds/rightBounds arrays

3
components/script/dom/webidls/XRSession.webidl
View file

@ -25,7 +25,10 @@ interface XRSession : EventTarget {
// // Methods
Promise<XRReferenceSpace> requestReferenceSpace(XRReferenceSpaceOptions options);
// workaround until we have FrozenArray
// see https://github.com/servo/servo/issues/10427#issuecomment-449593626
// FrozenArray<XRInputSource> getInputSources();
sequence<XRInputSource> getInputSources();
Promise<void> updateRenderState(optional XRRenderStateInit state);
long requestAnimationFrame(XRFrameRequestCallback callback);

6
components/script/dom/xrsession.rs
View file

@ -19,6 +19,7 @@ use crate::dom::eventtarget::EventTarget;
use crate::dom::globalscope::GlobalScope;
use crate::dom::promise::Promise;
use crate::dom::vrdisplay::VRDisplay;
use crate::dom::xrinputsource::XRInputSource;
use crate::dom::xrlayer::XRLayer;
use crate::dom::xrreferencespace::XRReferenceSpace;
use crate::dom::xrrenderstate::XRRenderState;
@ -153,4 +154,9 @@ impl XRSessionMethods for XRSession {
p
}
/// https://immersive-web.github.io/webxr/#dom-xrsession-getinputsources
fn GetInputSources(&self) -> Vec<DomRoot<XRInputSource>> {
self.display.get_input_sources()
}
}