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

Use out parameter for generated methods returning JSVal (#34087)

Browse source 
* Make generated bindings that return a WebIDL `any` value use out parameters.

Returning raw JSVal values makes it easier to create GC hazards in code
that calls these methods. Accepting a MutableHandle argument instead
ensures that the values are rooted by the caller.

Signed-off-by: Josh Matthews <josh@joshmatthews.net>

* Update mozjs.

Signed-off-by: Josh Matthews <josh@joshmatthews.net>

* Fix clippy warnings.

Signed-off-by: Josh Matthews <josh@joshmatthews.net>

---------

Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
Josh Matthews 2024-11-05 03:29:08 -05:00 • committed by GitHub
parent 537958a3cc
commit 25a0764a37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
38 changed files with 763 additions and 515 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/script/dom/messageevent.rs
View file

@ -5,7 +5,7 @@
use dom_struct::dom_struct;
use js::jsapi::Heap;
use js::jsval::JSVal;
use js::rust::{HandleObject, HandleValue};
use js::rust::{HandleObject, HandleValue, MutableHandleValue};
use servo_atoms::Atom;
use crate::dom::bindings::cell::DomRefCell;
@ -266,8 +266,8 @@ impl MessageEventMethods for MessageEvent {
}
/// <https://html.spec.whatwg.org/multipage/#dom-messageevent-data>
fn Data(&self, _cx: JSContext) -> JSVal {
self.data.get()
fn Data(&self, _cx: JSContext, mut retval: MutableHandleValue) {
retval.set(self.data.get())
}
/// <https://html.spec.whatwg.org/multipage/#dom-messageevent-origin>
@ -302,9 +302,10 @@ impl MessageEventMethods for MessageEvent {
}
/// <https://html.spec.whatwg.org/multipage/#dom-messageevent-ports>
fn Ports(&self, cx: JSContext) -> JSVal {
fn Ports(&self, cx: JSContext, mut retval: MutableHandleValue) {
if let Some(ports) = &*self.frozen_ports.borrow() {
return ports.get();
retval.set(ports.get());
return;
}
let ports: Vec<DomRoot<MessagePort>> = self
@ -313,7 +314,7 @@ impl MessageEventMethods for MessageEvent {
.iter()
.map(|port| DomRoot::from_ref(&**port))
.collect();
let frozen_ports = to_frozen_array(ports.as_slice(), cx);
to_frozen_array(ports.as_slice(), cx, retval);
// Safety: need to create the Heap value in its final memory location before setting it.
*self.frozen_ports.borrow_mut() = Some(Heap::default());
@ -321,9 +322,7 @@ impl MessageEventMethods for MessageEvent {
.borrow()
.as_ref()
.unwrap()
.set(frozen_ports);
frozen_ports
.set(retval.get());
}
/// <https://html.spec.whatwg.org/multipage/#dom-messageevent-initmessageevent>