diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/fetch/fetch_request_data.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/fetch/fetch_request_data.cc | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/chromium/third_party/blink/renderer/core/fetch/fetch_request_data.cc b/chromium/third_party/blink/renderer/core/fetch/fetch_request_data.cc index 6f62d48b412..dbafa4d4649 100644 --- a/chromium/third_party/blink/renderer/core/fetch/fetch_request_data.cc +++ b/chromium/third_party/blink/renderer/core/fetch/fetch_request_data.cc @@ -78,7 +78,7 @@ FetchRequestData* FetchRequestData::Create( for (const auto& pair : fetch_api_request.headers) { // TODO(leonhsl): Check sources of |fetch_api_request.headers| to make clear // whether we really need this filter. - if (DeprecatedEqualIgnoringCase(pair.key, "referer")) + if (EqualIgnoringASCIICase(pair.key, "referer")) continue; if (for_service_worker_fetch_event == ForServiceWorkerFetchEvent::kTrue && IsExcludedHeaderForServiceWorkerFetchEvent(pair.key)) { @@ -89,20 +89,25 @@ FetchRequestData* FetchRequestData::Create( if (fetch_api_request.blob) { DCHECK(!fetch_api_request.body); - request->SetBuffer(MakeGarbageCollected<BodyStreamBuffer>( + request->SetBuffer(BodyStreamBuffer::Create( script_state, MakeGarbageCollected<BlobBytesConsumer>( ExecutionContext::From(script_state), fetch_api_request.blob), nullptr /* AbortSignal */)); } else if (fetch_api_request.body) { - request->SetBuffer(MakeGarbageCollected<BodyStreamBuffer>( + request->SetBuffer(BodyStreamBuffer::Create( script_state, MakeGarbageCollected<FormDataBytesConsumer>( ExecutionContext::From(script_state), fetch_api_request.body), nullptr /* AbortSignal */)); } - request->SetContext(fetch_api_request.request_context_type); + // Context is always set to FETCH later, so we don't copy it + // from fetch_api_request here. + // TODO(crbug.com/1045925): Remove this comment too when + // we deprecate SetContext. + + request->SetDestination(fetch_api_request.destination); request->SetReferrerString(AtomicString(Referrer::NoReferrer())); if (fetch_api_request.referrer) { if (!fetch_api_request.referrer->url.IsEmpty()) @@ -132,6 +137,7 @@ FetchRequestData* FetchRequestData::CloneExceptBody() { request->origin_ = origin_; request->isolated_world_origin_ = isolated_world_origin_; request->context_ = context_; + request->destination_ = destination_; request->referrer_string_ = referrer_string_; request->referrer_policy_ = referrer_policy_; request->mode_ = mode_; @@ -146,6 +152,7 @@ FetchRequestData* FetchRequestData::CloneExceptBody() { request->keepalive_ = keepalive_; request->is_history_navigation_ = is_history_navigation_; request->window_id_ = window_id_; + request->trust_token_params_ = trust_token_params_; return request; } @@ -173,7 +180,7 @@ FetchRequestData* FetchRequestData::Pass(ScriptState* script_state, FetchRequestData* request = FetchRequestData::CloneExceptBody(); if (buffer_) { request->buffer_ = buffer_; - buffer_ = MakeGarbageCollected<BodyStreamBuffer>( + buffer_ = BodyStreamBuffer::Create( script_state, BytesConsumer::CreateClosed(), nullptr /* AbortSignal */); buffer_->CloseAndLockAndDisturb(exception_state); if (exception_state.HadException()) @@ -189,6 +196,7 @@ FetchRequestData::FetchRequestData() : method_(http_names::kGET), header_list_(MakeGarbageCollected<FetchHeaderList>()), context_(mojom::RequestContextType::UNSPECIFIED), + destination_(network::mojom::RequestDestination::kEmpty), referrer_string_(Referrer::ClientReferrerString()), referrer_policy_(network::mojom::ReferrerPolicy::kDefault), mode_(network::mojom::RequestMode::kNoCors), @@ -200,7 +208,7 @@ FetchRequestData::FetchRequestData() priority_(ResourceLoadPriority::kUnresolved), keepalive_(false) {} -void FetchRequestData::Trace(blink::Visitor* visitor) { +void FetchRequestData::Trace(Visitor* visitor) { visitor->Trace(buffer_); visitor->Trace(header_list_); } |