mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Add console message support to devtools. Does not actually cause logging to occur in the remote console.
This commit is contained in:
parent
149053c2a7
commit
6699738cae
7 changed files with 112 additions and 16 deletions
|
@ -4,31 +4,35 @@
|
|||
|
||||
use dom::bindings::codegen::Bindings::ConsoleBinding;
|
||||
use dom::bindings::codegen::Bindings::ConsoleBinding::ConsoleMethods;
|
||||
use dom::bindings::global::GlobalRef;
|
||||
use dom::bindings::global::{GlobalRef, GlobalField};
|
||||
use dom::bindings::js::{JSRef, Temporary};
|
||||
use dom::bindings::utils::{Reflector, reflect_dom_object};
|
||||
use devtools_traits::{SendConsoleMessage, ConsoleMessage};
|
||||
use util::str::DOMString;
|
||||
|
||||
#[dom_struct]
|
||||
pub struct Console {
|
||||
reflector_: Reflector
|
||||
reflector_: Reflector,
|
||||
global: GlobalField,
|
||||
}
|
||||
|
||||
impl Console {
|
||||
fn new_inherited() -> Console {
|
||||
fn new_inherited(global: GlobalRef) -> Console {
|
||||
Console {
|
||||
reflector_: Reflector::new()
|
||||
reflector_: Reflector::new(),
|
||||
global: GlobalField::from_rooted(&global),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new(global: GlobalRef) -> Temporary<Console> {
|
||||
reflect_dom_object(box Console::new_inherited(), global, ConsoleBinding::Wrap)
|
||||
reflect_dom_object(box Console::new_inherited(global), global, ConsoleBinding::Wrap)
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> ConsoleMethods for JSRef<'a, Console> {
|
||||
fn Log(self, message: DOMString) {
|
||||
println!("{}", message);
|
||||
propagate_console_msg(&self, ConsoleMessage::LogMessage(message));
|
||||
}
|
||||
|
||||
fn Debug(self, message: DOMString) {
|
||||
|
@ -58,3 +62,18 @@ impl<'a> ConsoleMethods for JSRef<'a, Console> {
|
|||
}
|
||||
}
|
||||
|
||||
fn propagate_console_msg(console: &JSRef<Console>, console_message: ConsoleMessage) {
|
||||
let global = console.global.root();
|
||||
match global.r() {
|
||||
GlobalRef::Window(window_ref) => {
|
||||
let pipelineId = window_ref.page().id;
|
||||
console.global.root().r().as_window().page().devtools_chan.as_ref().map(|chan| {
|
||||
chan.send(SendConsoleMessage(pipelineId, console_message.clone())).unwrap();
|
||||
});
|
||||
},
|
||||
|
||||
GlobalRef::Worker(_) => {
|
||||
// TODO: support worker console logs
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue