Index: Source/core/platform/network/FormData.cpp |
diff --git a/Source/core/platform/network/FormData.cpp b/Source/core/platform/network/FormData.cpp |
index dced1297d13c5cc39c39a8136a12a2d027fbb26f..b9cdf76b8ff44500c289d2c62fb33571d80bbb9d 100644 |
--- a/Source/core/platform/network/FormData.cpp |
+++ b/Source/core/platform/network/FormData.cpp |
@@ -114,10 +114,10 @@ PassRefPtr<FormData> FormData::deepCopy() const |
formData->m_elements.uncheckedAppend(FormDataElement(e.m_filename, e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime)); |
break; |
case FormDataElement::encodedBlob: |
- formData->m_elements.uncheckedAppend(FormDataElement(e.m_url)); |
+ formData->m_elements.uncheckedAppend(FormDataElement(e.m_blobUUID, e.m_optionalBlobDataHandle)); |
break; |
- case FormDataElement::encodedURL: |
- formData->m_elements.uncheckedAppend(FormDataElement(e.m_url, e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime)); |
+ case FormDataElement::encodedFileSystemURL: |
+ formData->m_elements.uncheckedAppend(FormDataElement(e.m_fileSystemURL, e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime)); |
break; |
} |
} |
@@ -144,17 +144,17 @@ void FormData::appendFileRange(const String& filename, long long start, long lon |
m_elements.append(FormDataElement(filename, start, length, expectedModificationTime)); |
} |
-void FormData::appendBlob(const KURL& blobURL) |
+void FormData::appendBlob(const String& uuid, PassRefPtr<BlobDataHandle> optionalHandle) |
{ |
- m_elements.append(FormDataElement(blobURL)); |
+ m_elements.append(FormDataElement(uuid, optionalHandle)); |
} |
-void FormData::appendURL(const KURL& url) |
+void FormData::appendFileSystemURL(const KURL& url) |
{ |
m_elements.append(FormDataElement(url, 0, BlobDataItem::toEndOfFile, invalidFileTime())); |
} |
-void FormData::appendURLRange(const KURL& url, long long start, long long length, double expectedModificationTime) |
+void FormData::appendFileSystemURLRange(const KURL& url, long long start, long long length, double expectedModificationTime) |
{ |
m_elements.append(FormDataElement(url, start, length, expectedModificationTime)); |
} |
@@ -218,10 +218,10 @@ void FormData::appendKeyValuePairItems(const FormDataList& list, const WTF::Text |
if (!file->path().isEmpty()) |
appendFile(file->path()); |
if (!file->fileSystemURL().isEmpty()) |
- appendURL(file->fileSystemURL()); |
+ appendFileSystemURL(file->fileSystemURL()); |
+ } else { |
+ appendBlob(value.blob()->uuid(), value.blob()->blobDataHandle()); |
} |
- else |
- appendBlob(value.blob()->url()); |
} else |
appendData(value.data().data(), value.data().length()); |
appendData("\r\n", 2); |