mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #25161 - paulrouget:cachedMsgs, r=jdm
devtools: save and send cached messages @jdm the only real difference between your original patch and this PR is the removal of the `GetCachedMessages` messages that are not necessary anymore now that we directly send the message to the devtools. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #13161 (GitHub issue number if applicable)
This commit is contained in:
commit
136366bf64
8 changed files with 137 additions and 107 deletions
|
@ -476,9 +476,6 @@ impl DedicatedWorkerGlobalScope {
|
|||
DevtoolScriptControlMsg::EvaluateJS(_pipe_id, string, sender) => {
|
||||
devtools::handle_evaluate_js(self.upcast(), string, sender)
|
||||
},
|
||||
DevtoolScriptControlMsg::GetCachedMessages(pipe_id, message_types, sender) => {
|
||||
devtools::handle_get_cached_messages(pipe_id, message_types, sender)
|
||||
},
|
||||
DevtoolScriptControlMsg::WantsLiveNotifications(_pipe_id, bool_val) => {
|
||||
devtools::handle_wants_live_notifications(self.upcast(), bool_val)
|
||||
},
|
||||
|
|
|
@ -46,7 +46,7 @@ use crate::task_source::TaskSourceName;
|
|||
use crate::timers::{IsInterval, OneshotTimerCallback, OneshotTimerHandle};
|
||||
use crate::timers::{OneshotTimers, TimerCallback};
|
||||
use content_security_policy::CspList;
|
||||
use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId};
|
||||
use devtools_traits::{PageError, ScriptToDevtoolsControlMsg, WorkerId};
|
||||
use dom_struct::dom_struct;
|
||||
use ipc_channel::ipc::{self, IpcSender};
|
||||
use ipc_channel::router::ROUTER;
|
||||
|
@ -1085,6 +1085,27 @@ impl GlobalScope {
|
|||
// https://html.spec.whatwg.org/multipage/#runtime-script-errors-2
|
||||
if let Some(dedicated) = self.downcast::<DedicatedWorkerGlobalScope>() {
|
||||
dedicated.forward_error_to_worker_object(error_info);
|
||||
} else if self.is::<Window>() {
|
||||
if let Some(ref chan) = self.devtools_chan {
|
||||
let _ = chan.send(ScriptToDevtoolsControlMsg::ReportPageError(
|
||||
self.pipeline_id.clone(),
|
||||
PageError {
|
||||
type_: "PageError".to_string(),
|
||||
errorMessage: error_info.message.clone(),
|
||||
sourceName: error_info.filename.clone(),
|
||||
lineText: "".to_string(), //TODO
|
||||
lineNumber: error_info.lineno,
|
||||
columnNumber: error_info.column,
|
||||
category: "script".to_string(),
|
||||
timeStamp: 0, //TODO
|
||||
error: true,
|
||||
warning: false,
|
||||
exception: true,
|
||||
strict: false,
|
||||
private: false,
|
||||
},
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -371,9 +371,6 @@ impl ServiceWorkerGlobalScope {
|
|||
DevtoolScriptControlMsg::EvaluateJS(_pipe_id, string, sender) => {
|
||||
devtools::handle_evaluate_js(self.upcast(), string, sender)
|
||||
},
|
||||
DevtoolScriptControlMsg::GetCachedMessages(pipe_id, message_types, sender) => {
|
||||
devtools::handle_get_cached_messages(pipe_id, message_types, sender)
|
||||
},
|
||||
DevtoolScriptControlMsg::WantsLiveNotifications(_pipe_id, bool_val) => {
|
||||
devtools::handle_wants_live_notifications(self.upcast(), bool_val)
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue