| Index: WebCore/platform/chromium/support/WebHTTPBody.cpp
|
| ===================================================================
|
| --- WebCore/platform/chromium/support/WebHTTPBody.cpp (revision 140218)
|
| +++ WebCore/platform/chromium/support/WebHTTPBody.cpp (working copy)
|
| @@ -79,8 +79,8 @@
|
| result.fileStart = 0;
|
| result.fileLength = 0;
|
| result.modificationTime = invalidFileTime();
|
| - result.url = KURL();
|
| - result.blobURL = KURL();
|
| + result.fileSystemURL = KURL();
|
| + result.blobUUID = String();
|
|
|
| switch (element.m_type) {
|
| case FormDataElement::data:
|
| @@ -99,14 +99,13 @@
|
| #if ENABLE(BLOB)
|
| case FormDataElement::encodedBlob:
|
| result.type = Element::TypeBlob;
|
| - result.url = element.m_url;
|
| - result.blobURL = element.m_url; // FIXME: deprecate this.
|
| + result.blobUUID = element.m_blobUUID;
|
| break;
|
| #endif
|
| #if ENABLE(FILE_SYSTEM)
|
| - case FormDataElement::encodedURL:
|
| - result.type = Element::TypeURL;
|
| - result.url = element.m_url;
|
| + case FormDataElement::encodedFileSystemURL:
|
| + result.type = Element::TypeFileSystemURL;
|
| + result.fileSystemURL = element.m_fileSystemURL;
|
| result.fileStart = element.m_fileStart;
|
| result.fileLength = element.m_fileLength;
|
| result.modificationTime = element.m_expectedFileModificationTime;
|
| @@ -142,22 +141,22 @@
|
| #endif
|
| }
|
|
|
| -void WebHTTPBody::appendURLRange(const WebURL& url, long long start, long long length, double modificationTime)
|
| +void WebHTTPBody::appendURLRange(const WebURL& fileSystemURL, long long start, long long length, double modificationTime)
|
| {
|
| #if ENABLE(FILE_SYSTEM)
|
| // Currently we only support filesystem URL.
|
| - ASSERT(KURL(url).protocolIs("filesystem"));
|
| + ASSERT(KURL(fileSystemURL).protocolIs("filesystem"));
|
| ensureMutable();
|
| - m_private->appendURLRange(url, start, length, modificationTime);
|
| + m_private->appendURLRange(fileSystemURL, start, length, modificationTime);
|
| #endif
|
| }
|
|
|
| -void WebHTTPBody::appendBlob(const WebURL& blobURL)
|
| +void WebHTTPBody::appendBlob(const WebString& blobUUID)
|
| {
|
| #if ENABLE(BLOB)
|
| - ASSERT(KURL(blobURL).protocolIs("blob"));
|
| ensureMutable();
|
| - m_private->appendBlob(blobURL);
|
| + m_private->appendBlob(blobUUID, 0);
|
| + // Note we're not holding a ref to a BlobDataHandle in the underlying FormData.
|
| #endif
|
| }
|
|
|
|
|