Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

DevTools: Fix console in Firefox 131 (#33661)

Browse source 
* feat: remove deprecated resource-available-form

Signed-off-by: eri <epazos@igalia.com>

* chore: update targeted firefox version

Signed-off-by: eri <epazos@igalia.com>

---------

Signed-off-by: eri <epazos@igalia.com>
This commit is contained in:
eri 2024-10-09 13:09:06 +01:00 • committed by GitHub
parent a6da1daa12
commit af61b1a107
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 48 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/devtools/actors/watcher.rs
View file

@ -12,6 +12,7 @@
use std::collections::HashMap;
use std::net::TcpStream;
use std::time::{SystemTime, UNIX_EPOCH};
use log::warn;
use serde::Serialize;
@ -132,6 +133,19 @@ struct GetThreadConfigurationActorReply {
configuration: ThreadConfigurationActorMsg,
}
#[derive(Serialize)]
#[serde(rename_all = "camelCase")]
struct DocumentEvent {
#[serde(rename = "hasNativeConsoleAPI")]
has_native_console_api: Option<bool>,
name: String,
#[serde(rename = "newURI")]
new_uri: Option<String>,
time: u64,
title: Option<String>,
url: Option<String>,
}
#[derive(Serialize)]
struct WatcherTraits {
resources: HashMap<&'static str, bool>,
@ -166,7 +180,7 @@ impl Actor for WatcherActor {
/// `target-available-form` event.
///
/// - `watchResources`: Start watching certain resource types. This sends
/// `resource-available-form` events.
/// `resources-available-array` events.
///
/// - `getNetworkParentActor`: Returns the network parent actor. It doesn't seem to do much at
/// the moment.
@ -217,7 +231,23 @@ impl Actor for WatcherActor {
};
match resource {
"document-event" => {
target.document_event(stream);
// TODO: This is a hacky way of sending the 3 messages
// Figure out if there needs work to be done here, ensure the page is loaded
for &name in ["dom-loading", "dom-interactive", "dom-complete"].iter() {
let event = DocumentEvent {
has_native_console_api: Some(true),
name: name.into(),
new_uri: None,
time: SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap_or_default()
.as_millis()
as u64,
title: Some(target.title.borrow().clone()),
url: Some(target.url.borrow().clone()),
};
target.resource_available(event, "document-event".into());
}
},
"console-message" | "error-message" => {},
_ => warn!("resource {} not handled yet", resource),