mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +01:00
Use ROUTER::add_typed_route
instead of ROUTER::add_route
everywhere (#33866)
* 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:
parent
ff374c1428
commit
e33bae6d0a
40 changed files with 177 additions and 195 deletions
|
@ -51,7 +51,7 @@ webgpu = { path = "../webgpu" }
|
|||
webrender = { workspace = true }
|
||||
webrender_api = { workspace = true }
|
||||
webrender_traits = { workspace = true }
|
||||
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
|
||||
webxr-api = { workspace = true, features = ["ipc"] }
|
||||
|
||||
[target.'cfg(any(target_os="macos", all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64"))))'.dependencies]
|
||||
gaol = "0.2.1"
|
||||
|
|
|
@ -594,9 +594,11 @@ where
|
|||
T: for<'de> Deserialize<'de> + Serialize + Send + 'static,
|
||||
{
|
||||
let (crossbeam_sender, crossbeam_receiver) = unbounded();
|
||||
ROUTER.add_route(
|
||||
ipc_receiver.to_opaque(),
|
||||
Box::new(move |message| drop(crossbeam_sender.send(message.to::<T>()))),
|
||||
ROUTER.add_typed_route(
|
||||
ipc_receiver,
|
||||
Box::new(move |message| {
|
||||
let _ = crossbeam_sender.send(message);
|
||||
}),
|
||||
);
|
||||
crossbeam_receiver
|
||||
}
|
||||
|
|
|
@ -86,11 +86,10 @@ impl NetworkListener {
|
|||
},
|
||||
};
|
||||
|
||||
ROUTER.add_route(
|
||||
ipc_receiver.to_opaque(),
|
||||
ROUTER.add_typed_route(
|
||||
ipc_receiver,
|
||||
Box::new(move |message| {
|
||||
let msg = message.to();
|
||||
match msg {
|
||||
match message {
|
||||
Ok(FetchResponseMsg::ProcessResponse(request_id, res)) => {
|
||||
listener.check_redirect(request_id, res)
|
||||
},
|
||||
|
|
|
@ -240,21 +240,19 @@ impl Pipeline {
|
|||
let (script_to_devtools_ipc_sender, script_to_devtools_ipc_receiver) =
|
||||
ipc::channel().expect("Pipeline script to devtools chan");
|
||||
let devtools_sender = (*devtools_sender).clone();
|
||||
ROUTER.add_route(
|
||||
script_to_devtools_ipc_receiver.to_opaque(),
|
||||
Box::new(move |message| {
|
||||
match message.to::<ScriptToDevtoolsControlMsg>() {
|
||||
Err(e) => {
|
||||
error!("Cast to ScriptToDevtoolsControlMsg failed ({}).", e)
|
||||
},
|
||||
Ok(message) => {
|
||||
if let Err(e) = devtools_sender
|
||||
.send(DevtoolsControlMsg::FromScript(message))
|
||||
{
|
||||
warn!("Sending to devtools failed ({:?})", e)
|
||||
}
|
||||
},
|
||||
}
|
||||
ROUTER.add_typed_route(
|
||||
script_to_devtools_ipc_receiver,
|
||||
Box::new(move |message| match message {
|
||||
Err(e) => {
|
||||
error!("Cast to ScriptToDevtoolsControlMsg failed ({}).", e)
|
||||
},
|
||||
Ok(message) => {
|
||||
if let Err(e) = devtools_sender
|
||||
.send(DevtoolsControlMsg::FromScript(message))
|
||||
{
|
||||
warn!("Sending to devtools failed ({:?})", e)
|
||||
}
|
||||
},
|
||||
}),
|
||||
);
|
||||
script_to_devtools_ipc_sender
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue