| Index: Source/core/xml/XMLHttpRequest.cpp
|
| diff --git a/Source/core/xml/XMLHttpRequest.cpp b/Source/core/xml/XMLHttpRequest.cpp
|
| index dc6d85947c97ebbf57cb8fd5ca7261bd4ee50da6..1eb7c1b7940d883a4b6efbfa27cbc75428b83a83 100644
|
| --- a/Source/core/xml/XMLHttpRequest.cpp
|
| +++ b/Source/core/xml/XMLHttpRequest.cpp
|
| @@ -170,6 +170,7 @@ XMLHttpRequest::XMLHttpRequest(ExecutionContext* context, PassRefPtr<SecurityOri
|
| , m_timeoutMilliseconds(0)
|
| , m_state(UNSENT)
|
| , m_createdDocument(false)
|
| + , m_downloadedBlobLength(0)
|
| , m_error(false)
|
| , m_uploadEventsAllowed(true)
|
| , m_uploadComplete(false)
|
| @@ -273,31 +274,26 @@ Document* XMLHttpRequest::responseXML(ExceptionState& exceptionState)
|
| Blob* XMLHttpRequest::responseBlob()
|
| {
|
| ASSERT(m_responseTypeCode == ResponseTypeBlob);
|
| + ASSERT(!m_binaryResponseBuilder.get());
|
|
|
| // We always return null before DONE.
|
| if (m_error || m_state != DONE)
|
| return 0;
|
|
|
| if (!m_responseBlob) {
|
| - // FIXME: This causes two (or more) unnecessary copies of the data.
|
| - // Chromium stores blob data in the browser process, so we're pulling the data
|
| - // from the network only to copy it into the renderer to copy it back to the browser.
|
| - // Ideally we'd get the blob/file-handle from the ResourceResponse directly
|
| - // instead of copying the bytes. Embedders who store blob data in the
|
| - // same process as WebCore would at least to teach BlobData to take
|
| - // a SharedBuffer, even if they don't get the Blob from the network layer directly.
|
| + // When "blob" is specified for the responseType attribute,
|
| + // we redirect the downloaded data to a file-handle directly
|
| + // in the browser process.
|
| + // We get the file-path from the ResourceResponse directly
|
| + // instead of copying the bytes between the browser and the renderer.
|
| OwnPtr<BlobData> blobData = BlobData::create();
|
| + String filePath = m_response.downloadedFilePath();
|
| // If we errored out or got no data, we still return a blob, just an empty one.
|
| - size_t size = 0;
|
| - if (m_binaryResponseBuilder) {
|
| - RefPtr<RawData> rawData = RawData::create();
|
| - size = m_binaryResponseBuilder->size();
|
| - rawData->mutableData()->append(m_binaryResponseBuilder->data(), size);
|
| - blobData->appendData(rawData, 0, BlobDataItem::toEndOfFile);
|
| + if (!filePath.isEmpty() && m_downloadedBlobLength) {
|
| + blobData->appendFile(filePath);
|
| blobData->setContentType(responseMIMEType()); // responseMIMEType defaults to text/xml which may be incorrect.
|
| - m_binaryResponseBuilder.clear();
|
| }
|
| - m_responseBlob = Blob::create(BlobDataHandle::create(blobData.release(), size));
|
| + m_responseBlob = Blob::create(BlobDataHandle::create(blobData.release(), m_downloadedBlobLength));
|
| }
|
|
|
| return m_responseBlob.get();
|
| @@ -409,6 +405,25 @@ XMLHttpRequestUpload* XMLHttpRequest::upload()
|
| return m_upload.get();
|
| }
|
|
|
| +void XMLHttpRequest::trackProgress(int length)
|
| +{
|
| + m_receivedLength += length;
|
| +
|
| + if (m_async)
|
| + dispatchThrottledProgressEventSnapshot(EventTypeNames::progress);
|
| +
|
| + if (m_state != LOADING) {
|
| + changeState(LOADING);
|
| + } else {
|
| + // Firefox calls readyStateChanged every time it receives data. Do
|
| + // the same to align with Firefox.
|
| + //
|
| + // FIXME: Make our implementation and the spec consistent. This
|
| + // behavior was needed when the progress event was not available.
|
| + dispatchReadyStateChangeEvent();
|
| + }
|
| +}
|
| +
|
| void XMLHttpRequest::changeState(State newState)
|
| {
|
| if (m_state != newState) {
|
| @@ -789,6 +804,12 @@ void XMLHttpRequest::createRequest(ExceptionState& exceptionState)
|
| request.setHTTPMethod(m_method);
|
| request.setTargetType(ResourceRequest::TargetIsXHR);
|
|
|
| + // When "blob" is specified for the responseType attribute,
|
| + // we redirect the downloaded data to a file-handle directly
|
| + // and get the file-path as the result.
|
| + if (responseTypeCode() == ResponseTypeBlob)
|
| + request.setDownloadToFile(true);
|
| +
|
| InspectorInstrumentation::willLoadXHR(executionContext(), this, this, m_method, m_url, m_async, m_requestEntityBody ? m_requestEntityBody->deepCopy() : 0, m_requestHeaders, m_includeCredentials);
|
|
|
| if (m_requestEntityBody) {
|
| @@ -814,6 +835,12 @@ void XMLHttpRequest::createRequest(ExceptionState& exceptionState)
|
| options.mixedContentBlockingTreatment = TreatAsPassiveContent;
|
| options.timeoutMilliseconds = m_timeoutMilliseconds;
|
|
|
| + // Since we redirect the downloaded data to a file-handle directly
|
| + // when "blob" is specified for the responseType attribute,
|
| + // buffering is not needed.
|
| + if (responseTypeCode() == ResponseTypeBlob)
|
| + options.dataBufferingPolicy = DoNotBufferData;
|
| +
|
| m_exceptionCode = 0;
|
| m_error = false;
|
|
|
| @@ -1287,6 +1314,8 @@ void XMLHttpRequest::didReceiveResponse(unsigned long identifier, const Resource
|
|
|
| void XMLHttpRequest::didReceiveData(const char* data, int len)
|
| {
|
| + ASSERT(m_responseTypeCode != ResponseTypeBlob);
|
| +
|
| if (m_error)
|
| return;
|
|
|
| @@ -1319,7 +1348,7 @@ void XMLHttpRequest::didReceiveData(const char* data, int len)
|
|
|
| if (useDecoder) {
|
| m_responseText = m_responseText.concatenateWith(m_decoder->decode(data, len));
|
| - } else if (m_responseTypeCode == ResponseTypeArrayBuffer || m_responseTypeCode == ResponseTypeBlob) {
|
| + } else if (m_responseTypeCode == ResponseTypeArrayBuffer) {
|
| // Buffer binary data.
|
| if (!m_binaryResponseBuilder)
|
| m_binaryResponseBuilder = SharedBuffer::create();
|
| @@ -1333,21 +1362,27 @@ void XMLHttpRequest::didReceiveData(const char* data, int len)
|
| if (m_error)
|
| return;
|
|
|
| - m_receivedLength += len;
|
| + trackProgress(len);
|
| +}
|
|
|
| - if (m_async)
|
| - dispatchThrottledProgressEventSnapshot(EventTypeNames::progress);
|
| +void XMLHttpRequest::didDownloadData(int dataLength)
|
| +{
|
| + ASSERT(m_responseTypeCode == ResponseTypeBlob);
|
|
|
| - if (m_state != LOADING) {
|
| - changeState(LOADING);
|
| - } else {
|
| - // Firefox calls readyStateChanged every time it receives data. Do
|
| - // the same to align with Firefox.
|
| - //
|
| - // FIXME: Make our implementation and the spec consistent. This
|
| - // behavior was needed when the progress event was not available.
|
| - dispatchReadyStateChangeEvent();
|
| - }
|
| + if (m_error)
|
| + return;
|
| +
|
| + if (m_state < HEADERS_RECEIVED)
|
| + changeState(HEADERS_RECEIVED);
|
| +
|
| + if (!dataLength)
|
| + return;
|
| +
|
| + if (m_error)
|
| + return;
|
| +
|
| + m_downloadedBlobLength += dataLength;
|
| + trackProgress(dataLength);
|
| }
|
|
|
| void XMLHttpRequest::handleDidTimeout()
|
|
|