mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
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 -->
This commit is contained in:
commit
2b061192e9
1 changed files with 6 additions and 3 deletions
|
@ -535,10 +535,13 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
|
||||||
for stream in &accepted_connections {
|
for stream in &accepted_connections {
|
||||||
connections.push(stream.try_clone().unwrap());
|
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,
|
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
|
DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::ServerExitMsg) => break
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue