3 files changed, 22 insertions, 7 deletions
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index 2f339d1f8f8..ea284184410 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -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)
                 },
diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs
index 4896c59e048..8af14654342 100644
--- a/components/script/dom/globalscope.rs
+++ b/components/script/dom/globalscope.rs
@@ -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,
+                        },
+                    ));
+                }
             }
         }
     }
diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs
index 2a3f4d7041a..65eb2cc23b1 100644
--- a/components/script/dom/serviceworkerglobalscope.rs
+++ b/components/script/dom/serviceworkerglobalscope.rs
@@ -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)
                     },