Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #5895 - psdh:uniformiseMsgTypes, r=jdm

Browse source 
Fixes #5882

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5895)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-04-29 15:51:39 -05:00
commit 19a4a26364
9 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/layout/layout_task.rs
View file

@ -404,10 +404,10 @@ impl LayoutTask {
match port_to_read {
PortToRead::Pipeline => {
match self.pipeline_port.recv().unwrap() {
LayoutControlMsg::TickAnimationsMsg => {
LayoutControlMsg::TickAnimations => {
self.handle_request_helper(Msg::TickAnimations, possibly_locked_rw_data)
}
LayoutControlMsg::ExitNowMsg(exit_type) => {
LayoutControlMsg::ExitNow(exit_type) => {
self.handle_request_helper(Msg::ExitNow(exit_type),
possibly_locked_rw_data)
}
@ -516,7 +516,7 @@ impl LayoutTask {
return false
},
Msg::ExitNow(exit_type) => {
debug!("layout: ExitNowMsg received");
debug!("layout: ExitNow received");
self.exit_now(possibly_locked_rw_data, exit_type);
return false
}
@ -542,7 +542,7 @@ impl LayoutTask {
}
/// Enters a quiescent state in which no new messages except for
/// `layout_interface::Msg::ReapLayoutData` will be processed until an `ExitNowMsg` is
/// `layout_interface::Msg::ReapLayoutData` will be processed until an `ExitNow` is
/// received. A pong is immediately sent on the given response channel.
fn prepare_to_exit<'a>(&'a self,
response_chan: Sender<()>,
@ -561,7 +561,7 @@ impl LayoutTask {
break
}
_ => {
panic!("layout: message that wasn't `ExitNowMsg` received after \
panic!("layout: message that wasn't `ExitNow` received after \
`PrepareToExitMsg`")
}
}