aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorBogdan Cuza <bogdan.cuza@hotmail.com>2015-04-03 21:29:20 +0300
committerMs2ger <ms2ger@gmail.com>2015-04-04 17:34:05 +0200
commitc8c79624bd31e2cd767c8014c1b5a151beaa5566 (patch)
tree65a164b72e22bc74a7213985a521d34f26aa8339 /components
parent4ffeb81aa73fa87120eabb569fd14d7193813bdf (diff)
downloadservo-c8c79624bd31e2cd767c8014c1b5a151beaa5566.tar.gz
servo-c8c79624bd31e2cd767c8014c1b5a151beaa5566.zip
Support any number of arguments to console methods (fixes #5495).
Diffstat (limited to 'components')
-rw-r--r--components/script/dom/console.rs34
-rw-r--r--components/script/dom/webidls/Console.webidl10
2 files changed, 27 insertions, 17 deletions
diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs
index 69ececca802..60377018b76 100644
--- a/components/script/dom/console.rs
+++ b/components/script/dom/console.rs
@@ -31,26 +31,36 @@ impl Console {
}
impl<'a> ConsoleMethods for JSRef<'a, Console> {
- fn Log(self, message: DOMString) {
- println!("{}", 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 Log(self, messages: Vec<DOMString>) {
+ for message in messages {
+ println!("{}", 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) {
- println!("{}", message);
+ fn Debug(self, messages: Vec<DOMString>) {
+ for message in messages {
+ println!("{}", message);
+ }
}
- fn Info(self, message: DOMString) {
- println!("{}", message);
+ fn Info(self, messages: Vec<DOMString>) {
+ for message in messages {
+ println!("{}", message);
+ }
}
- fn Warn(self, message: DOMString) {
- println!("{}", message);
+ fn Warn(self, messages: Vec<DOMString>) {
+ for message in messages {
+ println!("{}", message);
+ }
}
- fn Error(self, message: DOMString) {
- println!("{}", message);
+ fn Error(self, messages: Vec<DOMString>) {
+ for message in messages {
+ println!("{}", message);
+ }
}
fn Assert(self, condition: bool, message: Option<DOMString>) {
diff --git a/components/script/dom/webidls/Console.webidl b/components/script/dom/webidls/Console.webidl
index 23b294596a8..d6926aba80f 100644
--- a/components/script/dom/webidls/Console.webidl
+++ b/components/script/dom/webidls/Console.webidl
@@ -12,10 +12,10 @@
interface Console {
// These should be DOMString message, DOMString message2, ...
- void log(DOMString message);
- void debug(DOMString message);
- void info(DOMString message);
- void warn(DOMString message);
- void error(DOMString message);
+ void log(DOMString... messages);
+ void debug(DOMString... messages);
+ void info(DOMString... messages);
+ void warn(DOMString... messages);
+ void error(DOMString... messages);
void assert(boolean condition, optional DOMString message);
};