From a95015b68a31bed3f96591f541ca40734eea4852 Mon Sep 17 00:00:00 2001 From: Brandon Fairchild Date: Mon, 10 Aug 2015 16:43:19 -0400 Subject: [PATCH] Rename SendConsoleMessage to ConsoleAPI Fixes #7131. --- components/devtools/lib.rs | 2 +- components/devtools_traits/lib.rs | 2 +- components/script/dom/console.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index a35d2eac471..41dbb20eb7e 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -413,7 +413,7 @@ fn run_server(sender: Sender, ids, script_sender, pageinfo))) => handle_new_global(actors.clone(), ids, script_sender, sender.clone(), &mut actor_pipelines, &mut actor_workers, pageinfo), - Ok(DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::SendConsoleMessage( + Ok(DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::ConsoleAPI( id, console_message, worker_id))) => diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index 599abab609b..4f818cf60ad 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -65,7 +65,7 @@ pub enum ScriptToDevtoolsControlMsg { NewGlobal((PipelineId, Option), IpcSender, DevtoolsPageInfo), - SendConsoleMessage(PipelineId, ConsoleMessage, Option), + ConsoleAPI(PipelineId, ConsoleMessage, Option), } /// Serialized JS return values diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index 535f25d895b..686c93b642c 100644 --- a/components/script/dom/console.rs +++ b/components/script/dom/console.rs @@ -100,7 +100,7 @@ fn propagate_console_msg(console: &&Console, console_message: ConsoleMessage) { let global = console.global.root(); let pipelineId = global.r().pipeline(); global.r().devtools_chan().as_ref().map(|chan| { - chan.send(ScriptToDevtoolsControlMsg::SendConsoleMessage( + chan.send(ScriptToDevtoolsControlMsg::ConsoleAPI( pipelineId, console_message.clone(), global.r().get_worker_id())).unwrap(); }); }