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

GC Fixes

Browse source
This commit is contained in:
Imanol Fernandez 2017-07-05 22:38:37 +02:00
parent fe4ee6de2e
commit e936eac831
5 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/gamepad.rs
View file

@ -20,6 +20,7 @@ use dom_struct::dom_struct;
use js::jsapi::{Heap, JSContext, JSObject}; use js::jsapi::{Heap, JSContext, JSObject};
use js::typedarray::{Float64Array, CreateWith}; use js::typedarray::{Float64Array, CreateWith};
use std::cell::Cell; use std::cell::Cell;
use std::ptr;
use webvr_traits::{WebVRGamepadData, WebVRGamepadHand, WebVRGamepadState}; use webvr_traits::{WebVRGamepadData, WebVRGamepadHand, WebVRGamepadState};
#[dom_struct] #[dom_struct]
@ -86,9 +87,13 @@ impl Gamepad {
data.display_id), data.display_id),
global, global,
GamepadBinding::Wrap); GamepadBinding::Wrap);
let cx = global.get_cx();
rooted!(in (cx) let mut array = ptr::null_mut());
unsafe { 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 gamepad
} }

13
components/script/dom/vreyeparameters.rs
View file

@ -14,6 +14,7 @@ use dom_struct::dom_struct;
use js::jsapi::{Heap, JSContext, JSObject}; use js::jsapi::{Heap, JSContext, JSObject};
use js::typedarray::{Float32Array, CreateWith}; use js::typedarray::{Float32Array, CreateWith};
use std::default::Default; use std::default::Default;
use std::ptr;
use webvr_traits::WebVREyeParameters; use webvr_traits::WebVREyeParameters;
#[dom_struct] #[dom_struct]
@ -41,14 +42,16 @@ impl VREyeParameters {
pub fn new(parameters: WebVREyeParameters, global: &GlobalScope) -> Root<VREyeParameters> { pub fn new(parameters: WebVREyeParameters, global: &GlobalScope) -> Root<VREyeParameters> {
let fov = VRFieldOfView::new(&global, parameters.field_of_view.clone()); 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(&parameters.offset), array.handle_mut());
}
let eye_parameters = reflect_dom_object(box VREyeParameters::new_inherited(parameters, &fov), let eye_parameters = reflect_dom_object(box VREyeParameters::new_inherited(parameters, &fov),
global, global,
VREyeParametersBinding::Wrap); VREyeParametersBinding::Wrap);
unsafe { eye_parameters.offset.set(array.get());
let _ = Float32Array::create(global.get_cx(),
CreateWith::Slice(&eye_parameters.parameters.borrow().offset),
eye_parameters.offset.handle_mut());
}
eye_parameters eye_parameters
} }

5
components/script/dom/vrframedata.rs
View file

@ -16,6 +16,7 @@ use dom_struct::dom_struct;
use js::jsapi::{Heap, JSContext, JSObject}; use js::jsapi::{Heap, JSContext, JSObject};
use js::typedarray::{Float32Array, CreateWith}; use js::typedarray::{Float32Array, CreateWith};
use std::cell::Cell; use std::cell::Cell;
use std::ptr;
use webvr_traits::WebVRFrameData; use webvr_traits::WebVRFrameData;
#[dom_struct] #[dom_struct]
@ -72,9 +73,11 @@ impl VRFrameData {
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn create_typed_array(cx: *mut JSContext, src: &[f32], dst: &Heap<*mut JSObject>) { fn create_typed_array(cx: *mut JSContext, src: &[f32], dst: &Heap<*mut JSObject>) {
rooted!(in (cx) let mut array = ptr::null_mut());
unsafe { 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 { impl VRFrameData {

4
components/script/dom/vrpose.rs
View file

@ -32,7 +32,9 @@ unsafe fn update_or_create_typed_array(cx: *mut JSContext,
match src { match src {
Some(data) => { Some(data) => {
if dst.get().is_null() { 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 { } else {
typedarray!(in(cx) let array: Float32Array = dst.get()); typedarray!(in(cx) let array: Float32Array = dst.get());
if let Ok(mut array) = array { if let Ok(mut array) = array {

15
components/script/dom/vrstageparameters.rs
View file

@ -13,6 +13,7 @@ use dom::globalscope::GlobalScope;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use js::jsapi::{Heap, JSContext, JSObject}; use js::jsapi::{Heap, JSContext, JSObject};
use js::typedarray::{Float32Array, CreateWith}; use js::typedarray::{Float32Array, CreateWith};
use std::ptr;
use webvr_traits::WebVRStageParameters; use webvr_traits::WebVRStageParameters;
#[dom_struct] #[dom_struct]
@ -37,15 +38,17 @@ impl VRStageParameters {
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub fn new(parameters: WebVRStageParameters, global: &GlobalScope) -> Root<VRStageParameters> { pub fn new(parameters: WebVRStageParameters, global: &GlobalScope) -> Root<VRStageParameters> {
let cx = global.get_cx(); let cx = global.get_cx();
rooted!(in (cx) let mut array = ptr::null_mut());
unsafe {
let _ = Float32Array::create(cx, CreateWith::Slice(&parameters.sitting_to_standing_transform),
array.handle_mut());
}
let stage_parameters = reflect_dom_object(box VRStageParameters::new_inherited(parameters), let stage_parameters = reflect_dom_object(box VRStageParameters::new_inherited(parameters),
global, global,
VRStageParametersBinding::Wrap); VRStageParametersBinding::Wrap);
unsafe {
let source = &stage_parameters.parameters.borrow().sitting_to_standing_transform; stage_parameters.transform.set(array.get());
let _ = Float32Array::create(cx,
CreateWith::Slice(source),
stage_parameters.transform.handle_mut());
}
stage_parameters stage_parameters
} }