Auto merge of #22533 - CYBAI:rm-sw-foreign, r=jdm

Remove `foreign` service-workers mode

Bringing in the spec changes from whatwg/fetch#596

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because the corresponding tests should already be removed.

<!-- 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/22533)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-12-22 22:36:03 -05:00 committed by GitHub
commit 47eb8fe3db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 16 deletions

View file

@ -505,21 +505,11 @@ pub fn http_fetch(
// nothing to do, since actual_response is a function on response
// Step 3
if request.service_workers_mode != ServiceWorkersMode::None {
// Substep 1
if request.service_workers_mode == ServiceWorkersMode::All {
// TODO (handle fetch unimplemented)
}
// TODO: Substep 1
// Set response to the result of invoking handle fetch for request.
// Substep 2
if response.is_none() && request.is_subresource_request() && match request.origin {
Origin::Origin(ref origin) => *origin == request.url().origin(),
_ => false,
} {
// TODO (handle foreign fetch unimplemented)
}
// Substep 3
if let Some(ref res) = response {
// Subsubstep 1
// TODO: transmit body for request
@ -567,7 +557,7 @@ pub fn http_fetch(
// Substep 2
if request.redirect_mode == RedirectMode::Follow {
request.service_workers_mode = ServiceWorkersMode::Foreign;
request.service_workers_mode = ServiceWorkersMode::None;
}
// Substep 3

View file

@ -102,7 +102,6 @@ pub enum CacheMode {
#[derive(Clone, Copy, Debug, Deserialize, MallocSizeOf, PartialEq, Serialize)]
pub enum ServiceWorkersMode {
All,
Foreign,
None,
}

View file

@ -152,7 +152,7 @@ pub fn Fetch(
// Step 3
if global.downcast::<ServiceWorkerGlobalScope>().is_some() {
request_init.service_workers_mode = ServiceWorkersMode::Foreign;
request_init.service_workers_mode = ServiceWorkersMode::None;
}
// Step 4