diff options
author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebCore/xml/XMLHttpRequest.cpp | |
parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebCore/xml/XMLHttpRequest.cpp')
-rw-r--r-- | WebCore/xml/XMLHttpRequest.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/WebCore/xml/XMLHttpRequest.cpp b/WebCore/xml/XMLHttpRequest.cpp index fc7eb9e..6103703 100644 --- a/WebCore/xml/XMLHttpRequest.cpp +++ b/WebCore/xml/XMLHttpRequest.cpp @@ -586,22 +586,6 @@ void XMLHttpRequest::send(DOMFormData* body, ExceptionCode& ec) createRequest(ec); } -#if ENABLE(3D_CANVAS) || ENABLE(BLOB) -void XMLHttpRequest::send(ArrayBuffer* body, ExceptionCode& ec) -{ - if (!initSend(ec)) - return; - - if (m_method != "GET" && m_method != "HEAD" && m_url.protocolInHTTPFamily()) { - m_requestEntityBody = FormData::create(body->data(), body->byteLength()); - if (m_upload) - m_requestEntityBody->setAlwaysStream(true); - } - - createRequest(ec); -} -#endif - void XMLHttpRequest::createRequest(ExceptionCode& ec) { #if ENABLE(BLOB) @@ -1023,7 +1007,7 @@ void XMLHttpRequest::didSendData(unsigned long long bytesSent, unsigned long lon return; if (m_uploadEventsAllowed) - m_upload->dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().progressEvent, true, bytesSent, totalBytesToBeSent)); + m_upload->dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().progressEvent, true, static_cast<unsigned>(bytesSent), static_cast<unsigned>(totalBytesToBeSent))); if (bytesSent == totalBytesToBeSent && !m_uploadComplete) { m_uploadComplete = true; @@ -1092,7 +1076,7 @@ void XMLHttpRequest::didReceiveData(const char* data, int len) if (m_async) { bool lengthComputable = expectedLength && m_receivedLength <= expectedLength; - m_progressEventThrottle.dispatchProgressEvent(lengthComputable, m_receivedLength, expectedLength); + m_progressEventThrottle.dispatchProgressEvent(lengthComputable, static_cast<unsigned>(m_receivedLength), static_cast<unsigned>(expectedLength)); } if (m_state != LOADING) |