RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:47:44 +00:00
Code Issues Activity Actions

LibWeb/Fetch: Remove redundant timingInfo variables

Browse source 
This is an editorial change in the Fetch spec.

See: e8b67b0
This commit is contained in:
Linus Groh 2022-12-07 19:16:37 +00:00
parent a06b97dae0
commit ae0606711c
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Userland/Libraries/LibWeb/Fetch/Fetching/Fetching.cpp
View file

@ -752,10 +752,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<PendingResponse>> http_fetch(JS::Realm& rea
// 3. Let actualResponse be null. // 3. Let actualResponse be null.
JS::GCPtr<Infrastructure::Response> actual_response; JS::GCPtr<Infrastructure::Response> actual_response;
// 4. Let timingInfo be fetchParams’s timing info. // 4. If request’s service-workers mode is "all", then:
// FIXME: This is unused (spec issue)
// 5. If request’s service-workers mode is "all", then:
if (request->service_workers_mode() == Infrastructure::Request::ServiceWorkersMode::All) { if (request->service_workers_mode() == Infrastructure::Request::ServiceWorkersMode::All) {
// 1. Let requestForServiceWorker be a clone of request. // 1. Let requestForServiceWorker be a clone of request.
auto request_for_service_worker = TRY(request->clone(vm)); auto request_for_service_worker = TRY(request->clone(vm));
@ -812,7 +809,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<PendingResponse>> http_fetch(JS::Realm& rea
JS::GCPtr<PendingResponse> pending_actual_response; JS::GCPtr<PendingResponse> pending_actual_response;
// 6. If response is null, then: // 5. If response is null, then:
if (!response) { if (!response) {
// 1. If makeCORSPreflight is true and one of these conditions is true: // 1. If makeCORSPreflight is true and one of these conditions is true:
// NOTE: This step checks the CORS-preflight cache and if there is no suitable entry it performs a // NOTE: This step checks the CORS-preflight cache and if there is no suitable entry it performs a
@ -863,7 +860,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<PendingResponse>> http_fetch(JS::Realm& rea
request->set_timing_allow_failed(true); request->set_timing_allow_failed(true);
} }
// 7. If either request’s response tainting or response’s type is "opaque", and the cross-origin resource // 6. If either request’s response tainting or response’s type is "opaque", and the cross-origin resource
// policy check with request’s origin, request’s client, request’s destination, and actualResponse returns // policy check with request’s origin, request’s client, request’s destination, and actualResponse returns
// blocked, then return a network error. // blocked, then return a network error.
// NOTE: The cross-origin resource policy check runs for responses coming from the network and responses coming // NOTE: The cross-origin resource policy check runs for responses coming from the network and responses coming
@ -878,7 +875,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<PendingResponse>> http_fetch(JS::Realm& rea
JS::GCPtr<PendingResponse> inner_pending_response; JS::GCPtr<PendingResponse> inner_pending_response;
// 8. If actualResponse’s status is a redirect status, then: // 7. If actualResponse’s status is a redirect status, then:
if (Infrastructure::is_redirect_status(actual_response->status())) { if (Infrastructure::is_redirect_status(actual_response->status())) {
// FIXME: 1. If actualResponse’s status is not 303, request’s body is not null, and the connection uses HTTP/2, // FIXME: 1. If actualResponse’s status is not 303, request’s body is not null, and the connection uses HTTP/2,
// then user agents may, and are even encouraged to, transmit an RST_STREAM frame. // then user agents may, and are even encouraged to, transmit an RST_STREAM frame.
@ -923,7 +920,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<PendingResponse>> http_fetch(JS::Realm& rea
} }
}); });
// 9. Return response. // 8. Return response.
// NOTE: Typically actualResponse’s body’s stream is still being enqueued to after returning. // NOTE: Typically actualResponse’s body’s stream is still being enqueued to after returning.
return returned_pending_response; return returned_pending_response;
} }
@ -1332,9 +1329,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<PendingResponse>> http_network_or_cache_fet
// 24. If httpRequest’s cache mode is neither "no-store" nor "reload", then: // 24. If httpRequest’s cache mode is neither "no-store" nor "reload", then:
if (http_request->cache_mode() != Infrastructure::Request::CacheMode::NoStore if (http_request->cache_mode() != Infrastructure::Request::CacheMode::NoStore
&& http_request->cache_mode() != Infrastructure::Request::CacheMode::Reload) { && http_request->cache_mode() != Infrastructure::Request::CacheMode::Reload) {
// 1. Let timingInfo be fetchParams’s timing info. // 1. Set storedResponse to the result of selecting a response from the httpCache, possibly needing
// FIXME: This is unused (spec issue)
// Set storedResponse to the result of selecting a response from the httpCache, possibly needing
// validation, as per the "Constructing Responses from Caches" chapter of HTTP Caching [HTTP-CACHING], // validation, as per the "Constructing Responses from Caches" chapter of HTTP Caching [HTTP-CACHING],
// if any. // if any.
// NOTE: As mandated by HTTP, this still takes the `Vary` header into account. // NOTE: As mandated by HTTP, this still takes the `Vary` header into account.