corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

servo: Merge #7136 - Rename SendConsoleMessage to ConsoleAPI (from nerith:consoleapi); r=jdm

Browse Source 
Fixes #7131.

Source-Repo: https://github.com/servo/servo
Source-Revision: 41166fdb5bd16e96827118b9ab5543c65418c200
This commit is contained in:
Brandon Fairchild
2015-08-10 15:10:57 -06:00
parent 22f8c5ff5e
commit ad94b41657
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servo/components/devtools/lib.rs
View File

@@ -413,7 +413,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
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))) =>

2
servo/components/devtools_traits/lib.rs
View File

@@ -65,7 +65,7 @@ pub enum ScriptToDevtoolsControlMsg {
NewGlobal((PipelineId, Option<WorkerId>),
IpcSender<DevtoolScriptControlMsg>,
DevtoolsPageInfo),
SendConsoleMessage(PipelineId, ConsoleMessage, Option<WorkerId>),
ConsoleAPI(PipelineId, ConsoleMessage, Option<WorkerId>),
}
/// Serialized JS return values

2
servo/components/script/dom/console.rs
View File

@@ -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();
});
}