Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +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

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

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

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

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

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

@ -110,7 +110,7 @@ impl ServiceWorkerRegistration {
let worker_load_origin = WorkerScriptLoadOrigin { let worker_load_origin = WorkerScriptLoadOrigin {
referrer_url: None, referrer_url: None,
referrer_policy: None, referrer_policy: None,
pipeline_id: Some(global.pipeline_id()), pipeline_id: global.pipeline_id(),
}; };
let worker_id = WorkerId(Uuid::new_v4()); 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 { let worker_load_origin = WorkerScriptLoadOrigin {
referrer_url: None, referrer_url: None,
referrer_policy: None, referrer_policy: None,
pipeline_id: Some(global.pipeline_id()), pipeline_id: global.pipeline_id(),
}; };
let (devtools_sender, devtools_receiver) = ipc::channel().unwrap(); let (devtools_sender, devtools_receiver) = ipc::channel().unwrap();

2
components/script_traits/lib.rs
View file

@ -962,7 +962,7 @@ pub struct WorkerScriptLoadOrigin {
/// the referrer policy which is used /// the referrer policy which is used
pub referrer_policy: Option<ReferrerPolicy>, pub referrer_policy: Option<ReferrerPolicy>,
/// the pipeline id of the entity requesting the load /// the pipeline id of the entity requesting the load
pub pipeline_id: Option<PipelineId>, pub pipeline_id: PipelineId,
} }
/// Errors from executing a paint worklet /// Errors from executing a paint worklet