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

BroadcastChannel: cleanup routers when closing tabs (#38046)

Browse source 
BroadcastChannel uses 2 hash maps in the constellation and they were not
kept properly in sync. Also fixed a logic error where
`Option<HashMap<...>>` was not considered empty when being `None`.

Testing: These warnings should not happen anymore:
[2025-07-14T03:54:22Z WARN constellation::constellation] No sender for
broadcast router: (4,1)

[2025-07-14T03:33:59Z WARN constellation_traits::structured_data]
Attempt to broadcast structured serialized data including ImageBitmap
(should never happen).
[2025-07-14T03:33:59Z WARN constellation_traits::structured_data]
Attempt to broadcast structured serialized data including MessagePort
(should never happen).
[2025-07-14T03:33:59Z WARN constellation_traits::structured_data]
Attempt to broadcast structured serialized data including
OffscreenCanvas (should never happen).
[2025-07-14T03:33:59Z WARN constellation_traits::structured_data]
Attempt to broadcast structured serialized data including ReadableStream
(should never happen).
[2025-07-14T03:33:59Z WARN constellation_traits::structured_data]
Attempt to broadcast structured serialized data including WritableStream
(should never happen).
[2025-07-14T03:33:59Z WARN constellation_traits::structured_data]
Attempt to broadcast structured serialized data including
TransformStream (should never happen).

Signed-off-by: webbeef <me@webbeef.org>
This commit is contained in:
webbeef 2025-07-14 08:43:45 -07:00 • committed by GitHub
parent 5bc3c3088a
commit 677184a0e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/constellation/constellation.rs
View file

@ -2000,6 +2000,12 @@ where
if self.broadcast_routers.remove(&router_id).is_none() { if self.broadcast_routers.remove(&router_id).is_none() {
warn!("Attempt to remove unknown broadcast-channel router."); warn!("Attempt to remove unknown broadcast-channel router.");
} }
// Also remove the router_id from the broadcast_channels list.
for channels in self.broadcast_channels.values_mut() {
for routers in channels.values_mut() {
routers.retain(|router| router != &router_id);
}
}
} }
/// Add a new broadcast router. /// Add a new broadcast router.

2
components/shared/constellation/structured_data/mod.rs
View file

@ -47,7 +47,7 @@ pub struct StructuredSerializedData {
impl StructuredSerializedData { impl StructuredSerializedData {
fn is_empty(&self, val: Transferrable) -> bool { fn is_empty(&self, val: Transferrable) -> bool {
fn is_field_empty<K, V>(field: &Option<HashMap<K, V>>) -> bool { fn is_field_empty<K, V>(field: &Option<HashMap<K, V>>) -> bool {
field.as_ref().is_some_and(|h| h.is_empty()) field.as_ref().is_none_or(|h| h.is_empty())
} }
match val { match val {
Transferrable::ImageBitmap => is_field_empty(&self.transferred_image_bitmaps), Transferrable::ImageBitmap => is_field_empty(&self.transferred_image_bitmaps),