diff --git a/components/script/dom/extendablemessageevent.rs b/components/script/dom/extendablemessageevent.rs index 0d0a29e914f..a1433ec6269 100644 --- a/components/script/dom/extendablemessageevent.rs +++ b/components/script/dom/extendablemessageevent.rs @@ -2,6 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ +use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::codegen::Bindings::ExtendableMessageEventBinding; use crate::dom::bindings::codegen::Bindings::ExtendableMessageEventBinding::ExtendableMessageEventMethods; use crate::dom::bindings::error::Fallible; @@ -32,6 +33,8 @@ pub struct ExtendableMessageEvent { origin: DOMString, lastEventId: DOMString, ports: Vec>, + #[ignore_malloc_size_of = "mozjs"] + frozen_ports: DomRefCell>>, } impl ExtendableMessageEvent { @@ -49,6 +52,7 @@ impl ExtendableMessageEvent { .into_iter() .map(|port| Dom::from_ref(&*port)) .collect(), + frozen_ports: DomRefCell::new(None), } } @@ -141,11 +145,22 @@ impl ExtendableMessageEventMethods for ExtendableMessageEvent { /// https://w3c.github.io/ServiceWorker/#extendablemessage-event-ports fn Ports(&self, cx: JSContext) -> JSVal { + if let Some(ports) = &*self.frozen_ports.borrow() { + return ports.get(); + } + let ports: Vec> = self .ports .iter() .map(|port| DomRoot::from_ref(&**port)) .collect(); - to_frozen_array(ports.as_slice(), cx) + let frozen_ports = to_frozen_array(ports.as_slice(), cx); + + // Cache the Js value. + let heap_val = Heap::default(); + heap_val.set(frozen_ports); + *self.frozen_ports.borrow_mut() = Some(heap_val); + + frozen_ports } } diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs index d7f32cb7c1a..54a6f2ee588 100644 --- a/components/script/dom/messageevent.rs +++ b/components/script/dom/messageevent.rs @@ -61,6 +61,8 @@ pub struct MessageEvent { source: DomRefCell>, lastEventId: DomRefCell, ports: DomRefCell>>, + #[ignore_malloc_size_of = "mozjs"] + frozen_ports: DomRefCell>>, } impl MessageEvent { @@ -82,6 +84,7 @@ impl MessageEvent { .map(|port| Dom::from_ref(&*port)) .collect(), ), + frozen_ports: DomRefCell::new(None), } } @@ -238,13 +241,24 @@ impl MessageEventMethods for MessageEvent { /// fn Ports(&self, cx: JSContext) -> JSVal { + if let Some(ports) = &*self.frozen_ports.borrow() { + return ports.get(); + } + let ports: Vec> = self .ports .borrow() .iter() .map(|port| DomRoot::from_ref(&**port)) .collect(); - to_frozen_array(ports.as_slice(), cx) + let frozen_ports = to_frozen_array(ports.as_slice(), cx); + + // Cache the Js value. + let heap_val = Heap::default(); + heap_val.set(frozen_ports); + *self.frozen_ports.borrow_mut() = Some(heap_val); + + frozen_ports } /// @@ -268,6 +282,7 @@ impl MessageEventMethods for MessageEvent { .into_iter() .map(|port| Dom::from_ref(&*port)) .collect(); + *self.frozen_ports.borrow_mut() = None; self.event .init_event(Atom::from(type_), bubbles, cancelable); } diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/messageevent-constructor.https.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/messageevent-constructor.https.html.ini index 73cfb17b2a2..e2ef27deb9d 100644 --- a/tests/wpt/metadata/html/webappapis/scripting/events/messageevent-constructor.https.html.ini +++ b/tests/wpt/metadata/html/webappapis/scripting/events/messageevent-constructor.https.html.ini @@ -1,7 +1,5 @@ [messageevent-constructor.https.html] type: testharness - [ports attribute should be a FrozenArray] - expected: FAIL [All parameters to initMessageEvent should be mandatory] expected: FAIL