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

Auto merge of #7140 - wilmoz:master, r=jdm

Browse source 
Remove Message suffix from NetworkEventMessage

https://github.com/servo/servo/issues/7129

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7140)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-11 01:34:47 -06:00
commit 15a73614f4
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/devtools/lib.rs
View file

@ -419,7 +419,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
worker_id))) =>
handle_console_message(actors.clone(), id, worker_id, console_message,
&actor_pipelines, &actor_workers),
Ok(DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::NetworkEventMessage(
Ok(DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::NetworkEvent(
request_id, network_event))) => {
// copy the accepted_connections vector
let mut connections = Vec::<TcpStream>::new();

2
components/devtools_traits/lib.rs
View file

@ -57,7 +57,7 @@ pub enum ChromeToDevtoolsControlMsg {
AddClient(TcpStream),
FramerateTick(String, f64),
ServerExitMsg,
NetworkEventMessage(String, NetworkEvent),
NetworkEvent(String, NetworkEvent),
}
#[derive(Deserialize, Serialize)]

8
components/net/http_loader.rs
View file

@ -277,8 +277,8 @@ reason: \"certificate verify failed\" }]))";
load_data.headers.clone(),
load_data.data.clone());
chan.send(DevtoolsControlMsg::FromChrome(
ChromeToDevtoolsControlMsg::NetworkEventMessage(request_id.clone(),
net_event))).unwrap();
ChromeToDevtoolsControlMsg::NetworkEvent(request_id.clone(),
net_event))).unwrap();
}
let mut response = match writer.send() {
@ -413,8 +413,8 @@ reason: \"certificate verify failed\" }]))";
metadata.status.clone(),
None);
chan.send(DevtoolsControlMsg::FromChrome(
ChromeToDevtoolsControlMsg::NetworkEventMessage(request_id,
net_event_response))).unwrap();
ChromeToDevtoolsControlMsg::NetworkEvent(request_id,
net_event_response))).unwrap();
}
match encoding_str {