af805bc51b
<!-- Please describe your changes on the following line: --> See https://github.com/servo/rust-mozjs/issues/343#issuecomment-294513870 Heap::new() constructor is unsafe. Heap should be set after reflect_dom_object call in order to prevent potential GC crashes. <!-- 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 - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- 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. --> Source-Repo: https://github.com/servo/servo Source-Revision: e8aa3759bd8f74f7a962e421bd0cbf2a0a3e35da
79 lines
2.8 KiB
Rust
79 lines
2.8 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use core::nonzero::NonZero;
|
|
use dom::bindings::cell::DOMRefCell;
|
|
use dom::bindings::codegen::Bindings::VREyeParametersBinding;
|
|
use dom::bindings::codegen::Bindings::VREyeParametersBinding::VREyeParametersMethods;
|
|
use dom::bindings::js::{JS, Root};
|
|
use dom::bindings::reflector::{Reflector, reflect_dom_object};
|
|
use dom::globalscope::GlobalScope;
|
|
use dom::vrfieldofview::VRFieldOfView;
|
|
use dom_struct::dom_struct;
|
|
use js::jsapi::{Heap, JSContext, JSObject};
|
|
use js::typedarray::{Float32Array, CreateWith};
|
|
use std::default::Default;
|
|
use webvr_traits::WebVREyeParameters;
|
|
|
|
#[dom_struct]
|
|
pub struct VREyeParameters {
|
|
reflector_: Reflector,
|
|
#[ignore_heap_size_of = "Defined in rust-webvr"]
|
|
parameters: DOMRefCell<WebVREyeParameters>,
|
|
offset: Heap<*mut JSObject>,
|
|
fov: JS<VRFieldOfView>,
|
|
}
|
|
|
|
unsafe_no_jsmanaged_fields!(WebVREyeParameters);
|
|
|
|
impl VREyeParameters {
|
|
fn new_inherited(parameters: WebVREyeParameters, fov: &VRFieldOfView) -> VREyeParameters {
|
|
VREyeParameters {
|
|
reflector_: Reflector::new(),
|
|
parameters: DOMRefCell::new(parameters),
|
|
offset: Heap::default(),
|
|
fov: JS::from_ref(&*fov)
|
|
}
|
|
}
|
|
|
|
#[allow(unsafe_code)]
|
|
pub fn new(parameters: WebVREyeParameters, global: &GlobalScope) -> Root<VREyeParameters> {
|
|
let fov = VRFieldOfView::new(&global, parameters.field_of_view.clone());
|
|
|
|
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
|
|
}
|
|
}
|
|
|
|
impl VREyeParametersMethods for VREyeParameters {
|
|
#[allow(unsafe_code)]
|
|
// https://w3c.github.io/webvr/#dom-vreyeparameters-offset
|
|
unsafe fn Offset(&self, _cx: *mut JSContext) -> NonZero<*mut JSObject> {
|
|
NonZero::new(self.offset.get())
|
|
}
|
|
|
|
// https://w3c.github.io/webvr/#dom-vreyeparameters-fieldofview
|
|
fn FieldOfView(&self) -> Root<VRFieldOfView> {
|
|
Root::from_ref(&*self.fov)
|
|
}
|
|
|
|
// https://w3c.github.io/webvr/#dom-vreyeparameters-renderwidth
|
|
fn RenderWidth(&self) -> u32 {
|
|
self.parameters.borrow().render_width
|
|
}
|
|
|
|
// https://w3c.github.io/webvr/#dom-vreyeparameters-renderheight
|
|
fn RenderHeight(&self) -> u32 {
|
|
self.parameters.borrow().render_height
|
|
}
|
|
}
|