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

Remove Optional pipeline_id

Browse source
This commit is contained in:
Warren Fisher 2019-12-19 02:25:43 -04:00
parent f183d66217
commit 5c3bda0251
5 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -320,24 +320,20 @@ impl DedicatedWorkerGlobalScope {
.credentials_mode(CredentialsMode::CredentialsSameOrigin)
.parser_metadata(ParserMetadata::NotParserInserted)
.use_url_credentials(true)
.pipeline_id(pipeline_id)
.pipeline_id(Some(pipeline_id))
.referrer(referrer)
.referrer_policy(referrer_policy)
.origin(origin);
let runtime = unsafe {
if let Some(pipeline_id) = pipeline_id {
let task_source = NetworkingTaskSource(
Box::new(WorkerThreadWorkerChan {
sender: own_sender.clone(),
worker: worker.clone(),
}),
pipeline_id,
);
new_child_runtime(parent, Some(task_source))
} else {
new_child_runtime(parent, None)
}
let task_source = NetworkingTaskSource(
Box::new(WorkerThreadWorkerChan {
sender: own_sender.clone(),
worker: worker.clone(),
}),
pipeline_id,
);
new_child_runtime(parent, Some(task_source))
};
let (devtools_mpsc_chan, devtools_mpsc_port) = unbounded();
@ -375,7 +371,7 @@ impl DedicatedWorkerGlobalScope {
.send(CommonScriptMsg::Task(
WorkerEvent,
Box::new(SimpleWorkerErrorHandler::new(worker)),
pipeline_id,
Some(pipeline_id),
TaskSourceName::DOMManipulation,
))
.unwrap();

2
components/script/dom/serviceworkerglobalscope.rs
View file

@ -289,7 +289,7 @@ impl ServiceWorkerGlobalScope {
.credentials_mode(CredentialsMode::Include)
.parser_metadata(ParserMetadata::NotParserInserted)
.use_url_credentials(true)
.pipeline_id(pipeline_id)
.pipeline_id(Some(pipeline_id))
.referrer(referrer)
.referrer_policy(referrer_policy)
.origin(origin);

2
components/script/dom/serviceworkerregistration.rs
View file

@ -110,7 +110,7 @@ impl ServiceWorkerRegistration {
let worker_load_origin = WorkerScriptLoadOrigin {
referrer_url: None,
referrer_policy: None,
pipeline_id: Some(global.pipeline_id()),
pipeline_id: global.pipeline_id(),
};
let worker_id = WorkerId(Uuid::new_v4());

2
components/script/dom/worker.rs
View file

@ -97,7 +97,7 @@ impl Worker {
let worker_load_origin = WorkerScriptLoadOrigin {
referrer_url: None,
referrer_policy: None,
pipeline_id: Some(global.pipeline_id()),
pipeline_id: global.pipeline_id(),
};
let (devtools_sender, devtools_receiver) = ipc::channel().unwrap();