Auto merge of #6893 - HarryLovesCode:master, r=jdm

Fixes Issue #6866



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6893)
<!-- Reviewable:end -->

1 files changed, 5 insertions, 13 deletions

diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs
index 41b21b7e12f..535f25d895b 100644
--- a/components/script/dom/console.rs
+++ b/components/script/dom/console.rs
@@ -98,17 +98,9 @@ fn prepare_message(logLevel: LogLevel, message: String) -> ConsoleMessage {
 
 fn propagate_console_msg(console: &&Console, console_message: ConsoleMessage) {
     let global = console.global.root();
-    match global.r() {
-        GlobalRef::Window(window_ref) => {
-            let pipelineId = window_ref.pipeline();
-            console.global.root().r().as_window().devtools_chan().as_ref().map(|chan| {
-                chan.send(ScriptToDevtoolsControlMsg::SendConsoleMessage(
-                    pipelineId, console_message.clone())).unwrap();
-            });
-        },
-
-        GlobalRef::Worker(_) => {
-            // TODO: support worker console logs
-        }
-    }
+    let pipelineId = global.r().pipeline();
+    global.r().devtools_chan().as_ref().map(|chan| {
+        chan.send(ScriptToDevtoolsControlMsg::SendConsoleMessage(
+            pipelineId, console_message.clone(), global.r().get_worker_id())).unwrap();
+    });
 }