Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Side by Side Diff: Source/modules/fetch/FetchManager.cpp

Issue 1192913007: Change BodyStreamBuffer to be FetchDataConsumerHandle-based and enable backpressure in Fetch API (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/fetch/FetchManager.h" 6 #include "modules/fetch/FetchManager.h"
7 7
8 #include "bindings/core/v8/ExceptionState.h" 8 #include "bindings/core/v8/ExceptionState.h"
9 #include "bindings/core/v8/ScriptPromiseResolver.h" 9 #include "bindings/core/v8/ScriptPromiseResolver.h"
10 #include "bindings/core/v8/ScriptState.h" 10 #include "bindings/core/v8/ScriptState.h"
11 #include "bindings/core/v8/V8ThrowException.h" 11 #include "bindings/core/v8/V8ThrowException.h"
12 #include "core/dom/DOMArrayBuffer.h" 12 #include "core/dom/DOMArrayBuffer.h"
13 #include "core/dom/ExceptionCode.h" 13 #include "core/dom/ExceptionCode.h"
14 #include "core/fetch/FetchUtils.h" 14 #include "core/fetch/FetchUtils.h"
15 #include "core/fileapi/Blob.h" 15 #include "core/fileapi/Blob.h"
16 #include "core/frame/csp/ContentSecurityPolicy.h" 16 #include "core/frame/csp/ContentSecurityPolicy.h"
17 #include "core/inspector/ConsoleMessage.h" 17 #include "core/inspector/ConsoleMessage.h"
18 #include "core/loader/ThreadableLoader.h" 18 #include "core/loader/ThreadableLoader.h"
19 #include "core/loader/ThreadableLoaderClient.h" 19 #include "core/loader/ThreadableLoaderClient.h"
20 #include "modules/fetch/Body.h" 20 #include "modules/fetch/Body.h"
21 #include "modules/fetch/BodyStreamBuffer.h" 21 #include "modules/fetch/BodyStreamBuffer.h"
22 #include "modules/fetch/DataConsumerHandleUtil.h"
22 #include "modules/fetch/FetchRequestData.h" 23 #include "modules/fetch/FetchRequestData.h"
23 #include "modules/fetch/Response.h" 24 #include "modules/fetch/Response.h"
24 #include "modules/fetch/ResponseInit.h" 25 #include "modules/fetch/ResponseInit.h"
25 #include "platform/network/ResourceError.h" 26 #include "platform/network/ResourceError.h"
26 #include "platform/network/ResourceRequest.h" 27 #include "platform/network/ResourceRequest.h"
27 #include "platform/network/ResourceResponse.h" 28 #include "platform/network/ResourceResponse.h"
28 #include "platform/weborigin/SecurityOrigin.h" 29 #include "platform/weborigin/SecurityOrigin.h"
29 #include "public/platform/WebURLRequest.h" 30 #include "public/platform/WebURLRequest.h"
30 #include "wtf/HashSet.h" 31 #include "wtf/HashSet.h"
31 32
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 break; 105 break;
105 case WebURLRequest::FetchRequestModeNoCORS: 106 case WebURLRequest::FetchRequestModeNoCORS:
106 m_request->setResponseTainting(FetchRequestData::OpaqueTainting); 107 m_request->setResponseTainting(FetchRequestData::OpaqueTainting);
107 break; 108 break;
108 case WebURLRequest::FetchRequestModeCORS: 109 case WebURLRequest::FetchRequestModeCORS:
109 case WebURLRequest::FetchRequestModeCORSWithForcedPreflight: 110 case WebURLRequest::FetchRequestModeCORSWithForcedPreflight:
110 m_request->setResponseTainting(FetchRequestData::CORSTainting); 111 m_request->setResponseTainting(FetchRequestData::CORSTainting);
111 break; 112 break;
112 } 113 }
113 } 114 }
114 FetchResponseData* responseData = FetchResponseData::createWithBuffer(BodySt reamBuffer::create(handle, "Failed to fetch")); 115 FetchResponseData* responseData = FetchResponseData::createWithBuffer(BodySt reamBuffer::create(createFetchDataConsumerHandleFromWebHandle(handle)));
115 responseData->setStatus(response.httpStatusCode()); 116 responseData->setStatus(response.httpStatusCode());
116 responseData->setStatusMessage(response.httpStatusText()); 117 responseData->setStatusMessage(response.httpStatusText());
117 for (auto& it : response.httpHeaderFields()) 118 for (auto& it : response.httpHeaderFields())
118 responseData->headerList()->append(it.key, it.value); 119 responseData->headerList()->append(it.key, it.value);
119 responseData->setURL(response.url()); 120 responseData->setURL(response.url());
120 responseData->setMIMEType(response.mimeType()); 121 responseData->setMIMEType(response.mimeType());
121 122
122 FetchResponseData* taintedResponse = responseData; 123 FetchResponseData* taintedResponse = responseData;
123 switch (m_request->tainting()) { 124 switch (m_request->tainting()) {
124 case FetchRequestData::BasicTainting: 125 case FetchRequestData::BasicTainting:
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 // FIXME: Support body. 315 // FIXME: Support body.
315 ResourceRequest request(m_request->url()); 316 ResourceRequest request(m_request->url());
316 request.setRequestContext(m_request->context()); 317 request.setRequestContext(m_request->context());
317 request.setHTTPMethod(m_request->method()); 318 request.setHTTPMethod(m_request->method());
318 const Vector<OwnPtr<FetchHeaderList::Header>>& list = m_request->headerList( )->list(); 319 const Vector<OwnPtr<FetchHeaderList::Header>>& list = m_request->headerList( )->list();
319 for (size_t i = 0; i < list.size(); ++i) { 320 for (size_t i = 0; i < list.size(); ++i) {
320 request.addHTTPHeaderField(AtomicString(list[i]->first), AtomicString(li st[i]->second)); 321 request.addHTTPHeaderField(AtomicString(list[i]->first), AtomicString(li st[i]->second));
321 } 322 }
322 323
323 if (m_request->method() != "GET" && m_request->method() != "HEAD") { 324 if (m_request->method() != "GET" && m_request->method() != "HEAD") {
324 RefPtr<BlobDataHandle> blobDataHandle = m_request->blobDataHandle(); 325 if (BodyStreamBuffer* buffer = m_request->buffer()) {
325 if (blobDataHandle.get()) { 326 RefPtr<BlobDataHandle> blobDataHandle = buffer->handle()->obtainRead er(nullptr)->drainAsBlobDataHandle(FetchDataConsumerHandle::Reader::AllowBlobWit hInvalidSize);
326 RefPtr<FormData> httpBody(FormData::create()); 327 RefPtr<FormData> httpBody(FormData::create());
327 httpBody->appendBlob(blobDataHandle->uuid(), blobDataHandle); 328 if (blobDataHandle)
329 httpBody->appendBlob(blobDataHandle->uuid(), blobDataHandle);
328 request.setHTTPBody(httpBody); 330 request.setHTTPBody(httpBody);
329 } 331 }
330 } 332 }
331 333
332 request.setUseStreamOnResponse(true); 334 request.setUseStreamOnResponse(true);
333 335
334 // "2. Append `Referer`/empty byte sequence, if |HTTPRequest|'s |referrer| 336 // "2. Append `Referer`/empty byte sequence, if |HTTPRequest|'s |referrer|
335 // is none, and `Referer`/|HTTPRequest|'s referrer, serialized and utf-8 337 // is none, and `Referer`/|HTTPRequest|'s referrer, serialized and utf-8
336 // encoded, otherwise, to HTTPRequest's header list. 338 // encoded, otherwise, to HTTPRequest's header list.
337 // We set the referrer using workerGlobalScope's URL in 339 // We set the referrer using workerGlobalScope's URL in
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 450
449 DEFINE_TRACE(FetchManager) 451 DEFINE_TRACE(FetchManager)
450 { 452 {
451 #if ENABLE(OILPAN) 453 #if ENABLE(OILPAN)
452 visitor->trace(m_executionContext); 454 visitor->trace(m_executionContext);
453 visitor->trace(m_loaders); 455 visitor->trace(m_loaders);
454 #endif 456 #endif
455 } 457 }
456 458
457 } // namespace blink 459 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/fetch/FetchBlobDataConsumerHandle.cpp ('k') | Source/modules/fetch/FetchRequestData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698