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

auto merge of #5229 : hsvalava/servo/m1503, r=jdm

Browse source 
Fixing ConsoleMsg for console.log messages in the Developer Tools web console.
This commit is contained in:
bors-servo 2015-03-19 21:48:48 -06:00
commit ab8d43910c
3 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/devtools/lib.rs
View file

@ -67,9 +67,12 @@ struct ConsoleAPICall {
#[derive(RustcEncodable)] #[derive(RustcEncodable)]
struct ConsoleMsg { struct ConsoleMsg {
logLevel: u32, level: String,
timestamp: u64, timeStamp: u64,
message: String, arguments: Vec<String>,
filename: String,
lineNumber: u32,
columnNumber: u32,
} }
/// Spin up a devtools server that listens for connections on the specified port. /// Spin up a devtools server that listens for connections on the specified port.
@ -192,14 +195,17 @@ fn run_server(receiver: Receiver<DevtoolsControlMsg>, port: u16) {
let actors = actors.lock().unwrap(); let actors = actors.lock().unwrap();
let console_actor = actors.find::<ConsoleActor>(console_actor_name.as_slice()); let console_actor = actors.find::<ConsoleActor>(console_actor_name.as_slice());
match console_message { match console_message {
ConsoleMessage::LogMessage(message) => { ConsoleMessage::LogMessage(message, filename, lineNumber, columnNumber) => {
let msg = ConsoleAPICall { let msg = ConsoleAPICall {
from: console_actor.name.clone(), from: console_actor.name.clone(),
__type__: "consoleAPICall".to_string(), __type__: "consoleAPICall".to_string(),
message: ConsoleMsg { message: ConsoleMsg {
logLevel: 0, level: "log".to_string(),
timestamp: precise_time_ns(), timeStamp: precise_time_ns(),
message: message, arguments: vec!(message),
filename: filename,
lineNumber: lineNumber,
columnNumber: columnNumber,
}, },
}; };
for stream in console_actor.streams.borrow_mut().iter_mut() { for stream in console_actor.streams.borrow_mut().iter_mut() {

3
components/devtools_traits/lib.rs
View file

@ -122,6 +122,7 @@ impl Decodable for Modification {
//TODO: Include options for Warn, Debug, Info, Error messages from Console //TODO: Include options for Warn, Debug, Info, Error messages from Console
#[derive(Clone)] #[derive(Clone)]
pub enum ConsoleMessage { pub enum ConsoleMessage {
LogMessage(String), // Log: message, filename, line number, column number
LogMessage(String, String, u32, u32),
//WarnMessage(String), //WarnMessage(String),
} }

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

@ -33,7 +33,8 @@ impl Console {
impl<'a> ConsoleMethods for JSRef<'a, Console> { impl<'a> ConsoleMethods for JSRef<'a, Console> {
fn Log(self, message: DOMString) { fn Log(self, message: DOMString) {
println!("{}", message); println!("{}", message);
propagate_console_msg(&self, ConsoleMessage::LogMessage(message)); //TODO: Sending fake values for filename, lineNumber and columnNumber in LogMessage; adjust later
propagate_console_msg(&self, ConsoleMessage::LogMessage(message, String::from_str("test"), 1, 1));
} }
fn Debug(self, message: DOMString) { fn Debug(self, message: DOMString) {