Skip to content
Permalink
Browse files

Auto merge of #13078 - wdv4758h:pipeline, r=jdm

Added using real pipeline ID value

Stop using fake pipeline ID value

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #13000
- [X] These changes do not require tests because no test for devtools

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13078)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Aug 27, 2016
2 parents 1fd2577 + f189a86 commit 2b061192e917401843de0bd1ba02232b403578cc
Showing with 6 additions and 3 deletions.
  1. +6 −3 components/devtools/lib.rs
@@ -535,10 +535,13 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
for stream in &accepted_connections {
connections.push(stream.try_clone().unwrap());
}
//TODO: Get pipeline_id from NetworkEventMessage after fixing the send in http_loader
// For now, the id of the first pipeline is passed

let pipeline_id = match network_event {
NetworkEvent::HttpResponse(ref response) => response.pipeline_id,
NetworkEvent::HttpRequest(ref request) => request.pipeline_id,
};
handle_network_event(actors.clone(), connections, &actor_pipelines, &mut actor_requests,
&actor_workers, PipelineId::fake_root_pipeline_id(), request_id, network_event);
&actor_workers, pipeline_id, request_id, network_event);
},
DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::ServerExitMsg) => break
}

0 comments on commit 2b06119

Please sign in to comment.
You can’t perform that action at this time.