mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
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:
commit
47eb8fe3db
3 changed files with 5 additions and 16 deletions
|
@ -505,21 +505,11 @@ pub fn http_fetch(
|
||||||
// nothing to do, since actual_response is a function on response
|
// nothing to do, since actual_response is a function on response
|
||||||
|
|
||||||
// Step 3
|
// Step 3
|
||||||
if request.service_workers_mode != ServiceWorkersMode::None {
|
|
||||||
// Substep 1
|
|
||||||
if request.service_workers_mode == ServiceWorkersMode::All {
|
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
|
// 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 {
|
if let Some(ref res) = response {
|
||||||
// Subsubstep 1
|
// Subsubstep 1
|
||||||
// TODO: transmit body for request
|
// TODO: transmit body for request
|
||||||
|
@ -567,7 +557,7 @@ pub fn http_fetch(
|
||||||
|
|
||||||
// Substep 2
|
// Substep 2
|
||||||
if request.redirect_mode == RedirectMode::Follow {
|
if request.redirect_mode == RedirectMode::Follow {
|
||||||
request.service_workers_mode = ServiceWorkersMode::Foreign;
|
request.service_workers_mode = ServiceWorkersMode::None;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Substep 3
|
// Substep 3
|
||||||
|
|
|
@ -102,7 +102,6 @@ pub enum CacheMode {
|
||||||
#[derive(Clone, Copy, Debug, Deserialize, MallocSizeOf, PartialEq, Serialize)]
|
#[derive(Clone, Copy, Debug, Deserialize, MallocSizeOf, PartialEq, Serialize)]
|
||||||
pub enum ServiceWorkersMode {
|
pub enum ServiceWorkersMode {
|
||||||
All,
|
All,
|
||||||
Foreign,
|
|
||||||
None,
|
None,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -152,7 +152,7 @@ pub fn Fetch(
|
||||||
|
|
||||||
// Step 3
|
// Step 3
|
||||||
if global.downcast::<ServiceWorkerGlobalScope>().is_some() {
|
if global.downcast::<ServiceWorkerGlobalScope>().is_some() {
|
||||||
request_init.service_workers_mode = ServiceWorkersMode::Foreign;
|
request_init.service_workers_mode = ServiceWorkersMode::None;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Step 4
|
// Step 4
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue