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

Use ROUTER::add_typed_route instead of ROUTER::add_route everywhere (#33866)

Browse source 
* Use ROUTER::add_typed_route where possible

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

* Update webxr, media and ipc-channel

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

---------

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
This commit is contained in:
Simon Wülker 2024-10-18 12:47:52 +02:00 • committed by GitHub
parent ff374c1428
commit e33bae6d0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
40 changed files with 177 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

50
components/script/dom/globalscope.rs
View file

@ -847,10 +847,10 @@ impl GlobalScope {
task_source,
canceller,
};
ROUTER.add_route(
timer_ipc_port.to_opaque(),
ROUTER.add_typed_route(
timer_ipc_port,
Box::new(move |message| {
let event = message.to().unwrap();
let event = message.unwrap();
timer_listener.handle(event);
}),
);
@ -1435,14 +1435,11 @@ impl GlobalScope {
task_source,
context,
};
ROUTER.add_route(
broadcast_control_receiver.to_opaque(),
Box::new(move |message| {
let msg = message.to();
match msg {
Ok(msg) => listener.handle(msg),
Err(err) => warn!("Error receiving a BroadcastMsg: {:?}", err),
}
ROUTER.add_typed_route(
broadcast_control_receiver,
Box::new(move |message| match message {
Ok(msg) => listener.handle(msg),
Err(err) => warn!("Error receiving a BroadcastMsg: {:?}", err),
}),
);
let router_id = BroadcastChannelRouterId::new();
@ -1491,14 +1488,11 @@ impl GlobalScope {
task_source,
context,
};
ROUTER.add_route(
port_control_receiver.to_opaque(),
Box::new(move |message| {
let msg = message.to();
match msg {
Ok(msg) => listener.notify(msg),
Err(err) => warn!("Error receiving a MessagePortMsg: {:?}", err),
}
ROUTER.add_typed_route(
port_control_receiver,
Box::new(move |message| match message {
Ok(msg) => listener.notify(msg),
Err(err) => warn!("Error receiving a MessagePortMsg: {:?}", err),
}),
);
let router_id = MessagePortRouterId::new();
@ -2021,13 +2015,10 @@ impl GlobalScope {
task_canceller,
};
ROUTER.add_route(
recv.to_opaque(),
ROUTER.add_typed_route(
recv.to_ipc_receiver(),
Box::new(move |msg| {
file_listener.handle(
msg.to()
.expect("Deserialization of file listener msg failed."),
);
file_listener.handle(msg.expect("Deserialization of file listener msg failed."));
}),
);
@ -2050,13 +2041,10 @@ impl GlobalScope {
task_canceller,
};
ROUTER.add_route(
recv.to_opaque(),
ROUTER.add_typed_route(
recv.to_ipc_receiver(),
Box::new(move |msg| {
file_listener.handle(
msg.to()
.expect("Deserialization of file listener msg failed."),
);
file_listener.handle(msg.expect("Deserialization of file listener msg failed."));
}),
);
}