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

implement CachedFrozenArray (#34145)

Browse source 
* extract code into CachedFrozenArray

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>

* fix borrow crash

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>

* fix already borrowed error

using an else will cause the borrow to live more than it needs
Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>

* restore return statement

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>

---------

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>
This commit is contained in:
Gae24 2024-11-06 22:26:08 +01:00 • committed by GitHub
parent 6c2b840e37
commit 48d193cb83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 98 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,12 +14,12 @@ use crate::dom::bindings::codegen::Bindings::MessageEventBinding;
use crate::dom::bindings::codegen::Bindings::MessageEventBinding::MessageEventMethods;
use crate::dom::bindings::codegen::UnionTypes::WindowProxyOrMessagePortOrServiceWorker;
use crate::dom::bindings::error::Fallible;
use crate::dom::bindings::frozenarray::CachedFrozenArray;
use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
use crate::dom::bindings::root::{Dom, DomRoot};
use crate::dom::bindings::str::DOMString;
use crate::dom::bindings::trace::RootedTraceableBox;
use crate::dom::bindings::utils::to_frozen_array;
use crate::dom::event::Event;
use crate::dom::eventtarget::EventTarget;
use crate::dom::globalscope::GlobalScope;
@ -64,7 +64,7 @@ pub struct MessageEvent {
lastEventId: DomRefCell<DOMString>,
ports: DomRefCell<Vec<Dom<MessagePort>>>,
#[ignore_malloc_size_of = "mozjs"]
frozen_ports: DomRefCell<Option<Heap<JSVal>>>,
frozen_ports: CachedFrozenArray,
}
#[allow(non_snake_case)]
@ -87,7 +87,7 @@ impl MessageEvent {
.map(|port| Dom::from_ref(&*port))
.collect(),
),
frozen_ports: DomRefCell::new(None),
frozen_ports: CachedFrozenArray::new(),
}
}
@ -302,27 +302,18 @@ impl MessageEventMethods for MessageEvent {
}
/// <https://html.spec.whatwg.org/multipage/#dom-messageevent-ports>
fn Ports(&self, cx: JSContext, mut retval: MutableHandleValue) {
if let Some(ports) = &*self.frozen_ports.borrow() {
retval.set(ports.get());
return;
}
let ports: Vec<DomRoot<MessagePort>> = self
.ports
.borrow()
.iter()
.map(|port| DomRoot::from_ref(&**port))
.collect();
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());
self.frozen_ports
.borrow()
.as_ref()
.unwrap()
.set(retval.get());
fn Ports(&self, cx: JSContext, retval: MutableHandleValue) {
self.frozen_ports.get_or_init(
|| {
self.ports
.borrow()
.iter()
.map(|port| DomRoot::from_ref(&**port))
.collect()
},
cx,
retval,
);
}
/// <https://html.spec.whatwg.org/multipage/#dom-messageevent-initmessageevent>
@ -347,7 +338,7 @@ impl MessageEventMethods for MessageEvent {
.into_iter()
.map(|port| Dom::from_ref(&*port))
.collect();
*self.frozen_ports.borrow_mut() = None;
self.frozen_ports.clear();
self.event
.init_event(Atom::from(type_), bubbles, cancelable);
}