aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/dedicatedworkerglobalscope.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-12-19 10:10:15 -0500
committerGitHub <noreply@github.com>2019-12-19 10:10:15 -0500
commitaa36d5f657eb32b59d994d08b177a02372b4b01c (patch)
treec59e1285467e3dc3070b68345a7993851aae12d4 /components/script/dom/dedicatedworkerglobalscope.rs
parent1a31e495a19b364d98b2eae9c2718e098bfc0bde (diff)
parent5c3bda025144118fc8dd67a3f975d8f91fd25e78 (diff)
downloadservo-aa36d5f657eb32b59d994d08b177a02372b4b01c.tar.gz
servo-aa36d5f657eb32b59d994d08b177a02372b4b01c.zip
Auto merge of #25338 - warren-fisher:master, r=jdm
Remove Optional pipeline_id <!-- Please describe your changes on the following line: --> All code that creates a WorkerScriptLoadOrigin passes a Some value for the pipeline, so we should remove the Option from the struct member field. I changed the `WorkerScriptLoadOrigin` struct in `components/script_traits/lib.rs` to have a PipelineId and not an Option<PipelineId>. In `components/script/dom/worker.rs` and `components/script/dom/serviceworkerregistration.rs` it was changed so that `WorkerScriptLoadOrigin` was instantiated with a non-Optional. In `components/script/dom/dedicatedworkerglobalscope.rs` testing for if pipeline_id is an Optional is removed. In `components/script/dom/serviceworkerglobalscope.rs` and `components/script/dom/dedicatedworkerglobalscope.rs` a `PipelineId` was provided as an Optional to a `RequestBuilder` and I changed it to provide a `Some(pipeline_id)` instead. I am not sure changing the [RequestBuilder struct](https://github.com/warren-fisher/servo/blob/5c3bda025144118fc8dd67a3f975d8f91fd25e78/components/net_traits/request.rs#L118-L159) at line 147 to accept a non-optional was within this issue so I left it as is. I was able to successfully build it so I assume these changes worked, however I am not sure about the implications of the changes made in the unsafe block in `components/script/dom/dedicatedworkerglobalscope.rs`. <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #24772 (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because the issue says so <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/script/dom/dedicatedworkerglobalscope.rs')
-rw-r--r--components/script/dom/dedicatedworkerglobalscope.rs24
1 files changed, 10 insertions, 14 deletions
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index ea284184410..e9579565a44 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -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();