Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make Console::send_to_devtools take a &GlobalScope

Browse source
This commit is contained in:
Anthony Ramine 2016-10-02 01:20:35 +02:00
parent 3302a53d38
commit 092504b4e3
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/script/dom/console.rs
View file

@ -4,23 +4,23 @@
use devtools_traits::{ConsoleMessage, LogLevel, ScriptToDevtoolsControlMsg}; use devtools_traits::{ConsoleMessage, LogLevel, ScriptToDevtoolsControlMsg};
use dom::bindings::global::GlobalRef; use dom::bindings::global::GlobalRef;
use dom::bindings::inheritance::Castable;
use dom::bindings::str::DOMString; use dom::bindings::str::DOMString;
use dom::globalscope::GlobalScope;
use dom::workerglobalscope::WorkerGlobalScope;
// https://developer.mozilla.org/en-US/docs/Web/API/Console // https://developer.mozilla.org/en-US/docs/Web/API/Console
pub struct Console(()); pub struct Console(());
impl Console { impl Console {
fn send_to_devtools(global: GlobalRef, level: LogLevel, message: DOMString) { fn send_to_devtools(global: &GlobalScope, level: LogLevel, message: DOMString) {
let global_scope = global.as_global_scope(); if let Some(chan) = global.devtools_chan() {
if let Some(chan) = global_scope.devtools_chan() {
let console_message = prepare_message(level, message); let console_message = prepare_message(level, message);
let worker_id = if let GlobalRef::Worker(worker) = global { let worker_id = global.downcast::<WorkerGlobalScope>().map(|worker| {
Some(worker.get_worker_id()) worker.get_worker_id()
} else { });
None
};
let devtools_message = ScriptToDevtoolsControlMsg::ConsoleAPI( let devtools_message = ScriptToDevtoolsControlMsg::ConsoleAPI(
global_scope.pipeline_id(), global.pipeline_id(),
console_message, console_message,
worker_id); worker_id);
chan.send(devtools_message).unwrap(); chan.send(devtools_message).unwrap();
@ -33,7 +33,7 @@ impl Console {
pub fn Log(global: GlobalRef, messages: Vec<DOMString>) { pub fn Log(global: GlobalRef, messages: Vec<DOMString>) {
for message in messages { for message in messages {
println!("{}", message); println!("{}", message);
Self::send_to_devtools(global, LogLevel::Log, message); Self::send_to_devtools(global.as_global_scope(), LogLevel::Log, message);
} }
} }
@ -41,7 +41,7 @@ impl Console {
pub fn Debug(global: GlobalRef, messages: Vec<DOMString>) { pub fn Debug(global: GlobalRef, messages: Vec<DOMString>) {
for message in messages { for message in messages {
println!("{}", message); println!("{}", message);
Self::send_to_devtools(global, LogLevel::Debug, message); Self::send_to_devtools(global.as_global_scope(), LogLevel::Debug, message);
} }
} }
@ -49,7 +49,7 @@ impl Console {
pub fn Info(global: GlobalRef, messages: Vec<DOMString>) { pub fn Info(global: GlobalRef, messages: Vec<DOMString>) {
for message in messages { for message in messages {
println!("{}", message); println!("{}", message);
Self::send_to_devtools(global, LogLevel::Info, message); Self::send_to_devtools(global.as_global_scope(), LogLevel::Info, message);
} }
} }
@ -57,7 +57,7 @@ impl Console {
pub fn Warn(global: GlobalRef, messages: Vec<DOMString>) { pub fn Warn(global: GlobalRef, messages: Vec<DOMString>) {
for message in messages { for message in messages {
println!("{}", message); println!("{}", message);
Self::send_to_devtools(global, LogLevel::Warn, message); Self::send_to_devtools(global.as_global_scope(), LogLevel::Warn, message);
} }
} }
@ -65,7 +65,7 @@ impl Console {
pub fn Error(global: GlobalRef, messages: Vec<DOMString>) { pub fn Error(global: GlobalRef, messages: Vec<DOMString>) {
for message in messages { for message in messages {
println!("{}", message); println!("{}", message);
Self::send_to_devtools(global, LogLevel::Error, message); Self::send_to_devtools(global.as_global_scope(), LogLevel::Error, message);
} }
} }
@ -74,7 +74,7 @@ impl Console {
if !condition { if !condition {
let message = message.unwrap_or_else(|| DOMString::from("no message")); let message = message.unwrap_or_else(|| DOMString::from("no message"));
println!("Assertion failed: {}", message); println!("Assertion failed: {}", message);
Self::send_to_devtools(global, LogLevel::Error, message); Self::send_to_devtools(global.as_global_scope(), LogLevel::Error, message);
} }
} }
@ -83,7 +83,7 @@ impl Console {
if let Ok(()) = global.as_global_scope().time(label.clone()) { if let Ok(()) = global.as_global_scope().time(label.clone()) {
let message = DOMString::from(format!("{}: timer started", label)); let message = DOMString::from(format!("{}: timer started", label));
println!("{}", message); println!("{}", message);
Self::send_to_devtools(global, LogLevel::Log, message); Self::send_to_devtools(global.as_global_scope(), LogLevel::Log, message);
} }
} }
@ -94,7 +94,7 @@ impl Console {
format!("{}: {}ms", label, delta) format!("{}: {}ms", label, delta)
); );
println!("{}", message); println!("{}", message);
Self::send_to_devtools(global, LogLevel::Log, message); Self::send_to_devtools(global.as_global_scope(), LogLevel::Log, message);
}; };
} }
} }