mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #7136 - nerith:consoleapi, r=jdm
Rename SendConsoleMessage to ConsoleAPI Fixes #7131. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7136) <!-- Reviewable:end -->
This commit is contained in:
commit
41166fdb5b
3 changed files with 3 additions and 3 deletions
|
@ -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))) =>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue