mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Convert CGTraitInterface to use safe JSContext instead of raw JSContext
This commit is contained in:
parent
808fa65aef
commit
2c5d0a6ebc
43 changed files with 443 additions and 528 deletions
|
@ -10,8 +10,9 @@ use crate::dom::globalscope::GlobalScope;
|
|||
use crate::dom::vrframedata::create_typed_array;
|
||||
use crate::dom::xrrigidtransform::XRRigidTransform;
|
||||
use crate::dom::xrsession::{cast_transform, ApiViewerPose, XRSession};
|
||||
use crate::script_runtime::JSContext;
|
||||
use dom_struct::dom_struct;
|
||||
use js::jsapi::{Heap, JSContext, JSObject};
|
||||
use js::jsapi::{Heap, JSObject};
|
||||
use std::ptr::NonNull;
|
||||
use webxr_api::View;
|
||||
|
||||
|
@ -64,10 +65,8 @@ impl XRView {
|
|||
|
||||
// row_major since euclid uses row vectors
|
||||
let proj = view.projection.to_row_major_array();
|
||||
let cx = global.get_cx();
|
||||
unsafe {
|
||||
create_typed_array(cx, &proj, &ret.proj);
|
||||
}
|
||||
let cx = unsafe { JSContext::from_ptr(global.get_cx()) };
|
||||
create_typed_array(cx, &proj, &ret.proj);
|
||||
ret
|
||||
}
|
||||
|
||||
|
@ -82,9 +81,8 @@ impl XRViewMethods for XRView {
|
|||
self.eye
|
||||
}
|
||||
|
||||
#[allow(unsafe_code)]
|
||||
/// https://immersive-web.github.io/webxr/#dom-xrview-projectionmatrix
|
||||
unsafe fn ProjectionMatrix(&self, _cx: *mut JSContext) -> NonNull<JSObject> {
|
||||
fn ProjectionMatrix(&self, _cx: JSContext) -> NonNull<JSObject> {
|
||||
NonNull::new(self.proj.get()).unwrap()
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue