diff --git a/components/script/dom/gamepad.rs b/components/script/dom/gamepad.rs index cb0c20ac50e..a7f65050941 100644 --- a/components/script/dom/gamepad.rs +++ b/components/script/dom/gamepad.rs @@ -20,6 +20,7 @@ use dom_struct::dom_struct; use js::jsapi::{Heap, JSContext, JSObject}; use js::typedarray::{Float64Array, CreateWith}; use std::cell::Cell; +use std::ptr; use webvr_traits::{WebVRGamepadData, WebVRGamepadHand, WebVRGamepadState}; #[dom_struct] @@ -86,9 +87,13 @@ impl Gamepad { data.display_id), global, GamepadBinding::Wrap); + + let cx = global.get_cx(); + rooted!(in (cx) let mut array = ptr::null_mut()); unsafe { - let _ = Float64Array::create(global.get_cx(), CreateWith::Slice(&state.axes), gamepad.axes.handle_mut()); + let _ = Float64Array::create(cx, CreateWith::Slice(&state.axes), array.handle_mut()); } + gamepad.axes.set(array.get()); gamepad } diff --git a/components/script/dom/vreyeparameters.rs b/components/script/dom/vreyeparameters.rs index af39c789638..ab568287064 100644 --- a/components/script/dom/vreyeparameters.rs +++ b/components/script/dom/vreyeparameters.rs @@ -14,6 +14,7 @@ use dom_struct::dom_struct; use js::jsapi::{Heap, JSContext, JSObject}; use js::typedarray::{Float32Array, CreateWith}; use std::default::Default; +use std::ptr; use webvr_traits::WebVREyeParameters; #[dom_struct] @@ -41,14 +42,16 @@ impl VREyeParameters { pub fn new(parameters: WebVREyeParameters, global: &GlobalScope) -> Root { let fov = VRFieldOfView::new(&global, parameters.field_of_view.clone()); + let cx = global.get_cx(); + rooted!(in (cx) let mut array = ptr::null_mut()); + unsafe { + let _ = Float32Array::create(cx, CreateWith::Slice(¶meters.offset), array.handle_mut()); + } + let eye_parameters = reflect_dom_object(box VREyeParameters::new_inherited(parameters, &fov), global, VREyeParametersBinding::Wrap); - unsafe { - let _ = Float32Array::create(global.get_cx(), - CreateWith::Slice(&eye_parameters.parameters.borrow().offset), - eye_parameters.offset.handle_mut()); - } + eye_parameters.offset.set(array.get()); eye_parameters } diff --git a/components/script/dom/vrframedata.rs b/components/script/dom/vrframedata.rs index eef69e5ff46..a7b70c7ead3 100644 --- a/components/script/dom/vrframedata.rs +++ b/components/script/dom/vrframedata.rs @@ -16,6 +16,7 @@ use dom_struct::dom_struct; use js::jsapi::{Heap, JSContext, JSObject}; use js::typedarray::{Float32Array, CreateWith}; use std::cell::Cell; +use std::ptr; use webvr_traits::WebVRFrameData; #[dom_struct] @@ -72,9 +73,11 @@ impl VRFrameData { #[allow(unsafe_code)] fn create_typed_array(cx: *mut JSContext, src: &[f32], dst: &Heap<*mut JSObject>) { + rooted!(in (cx) let mut array = ptr::null_mut()); unsafe { - let _ = Float32Array::create(cx, CreateWith::Slice(src), dst.handle_mut()); + let _ = Float32Array::create(cx, CreateWith::Slice(src), array.handle_mut()); } + (*dst).set(array.get()); } impl VRFrameData { diff --git a/components/script/dom/vrpose.rs b/components/script/dom/vrpose.rs index 542059ca799..ee035e2a0f1 100644 --- a/components/script/dom/vrpose.rs +++ b/components/script/dom/vrpose.rs @@ -32,7 +32,9 @@ unsafe fn update_or_create_typed_array(cx: *mut JSContext, match src { Some(data) => { if dst.get().is_null() { - let _ = Float32Array::create(cx, CreateWith::Slice(data), dst.handle_mut()); + rooted!(in (cx) let mut array = ptr::null_mut()); + let _ = Float32Array::create(cx, CreateWith::Slice(data), array.handle_mut()); + (*dst).set(array.get()); } else { typedarray!(in(cx) let array: Float32Array = dst.get()); if let Ok(mut array) = array { diff --git a/components/script/dom/vrstageparameters.rs b/components/script/dom/vrstageparameters.rs index e709411c25a..9c38fb8d494 100644 --- a/components/script/dom/vrstageparameters.rs +++ b/components/script/dom/vrstageparameters.rs @@ -13,6 +13,7 @@ use dom::globalscope::GlobalScope; use dom_struct::dom_struct; use js::jsapi::{Heap, JSContext, JSObject}; use js::typedarray::{Float32Array, CreateWith}; +use std::ptr; use webvr_traits::WebVRStageParameters; #[dom_struct] @@ -37,15 +38,17 @@ impl VRStageParameters { #[allow(unsafe_code)] pub fn new(parameters: WebVRStageParameters, global: &GlobalScope) -> Root { let cx = global.get_cx(); + rooted!(in (cx) let mut array = ptr::null_mut()); + unsafe { + let _ = Float32Array::create(cx, CreateWith::Slice(¶meters.sitting_to_standing_transform), + array.handle_mut()); + } + let stage_parameters = reflect_dom_object(box VRStageParameters::new_inherited(parameters), global, VRStageParametersBinding::Wrap); - unsafe { - let source = &stage_parameters.parameters.borrow().sitting_to_standing_transform; - let _ = Float32Array::create(cx, - CreateWith::Slice(source), - stage_parameters.transform.handle_mut()); - } + + stage_parameters.transform.set(array.get()); stage_parameters }