summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/network/FormData.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/platform/network/FormData.cpp')
-rw-r--r--WebCore/platform/network/FormData.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/platform/network/FormData.cpp b/WebCore/platform/network/FormData.cpp
index 80f17da..31506ea 100644
--- a/WebCore/platform/network/FormData.cpp
+++ b/WebCore/platform/network/FormData.cpp
@@ -34,7 +34,7 @@
namespace WebCore {
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
const long long FormDataElement::toEndOfFile = -1;
const double FormDataElement::doNotCheckFileChange = 0;
#endif
@@ -133,7 +133,7 @@ PassRefPtr<FormData> FormData::deepCopy() const
formData->m_elements.append(FormDataElement(e.m_data));
break;
case FormDataElement::encodedFile:
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
formData->m_elements.append(FormDataElement(e.m_filename, e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime, e.m_shouldGenerateFile));
#else
formData->m_elements.append(FormDataElement(e.m_filename, e.m_shouldGenerateFile));
@@ -156,7 +156,7 @@ void FormData::appendData(const void* data, size_t size)
void FormData::appendFile(const String& filename, bool shouldGenerateFile)
{
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
m_elements.append(FormDataElement(filename, 0, FormDataElement::toEndOfFile, FormDataElement::doNotCheckFileChange, shouldGenerateFile));
#else
m_elements.append(FormDataElement(filename, shouldGenerateFile));
@@ -184,7 +184,7 @@ void FormData::appendItem(const BlobItem* item, bool shouldGenerateFile)
return;
}
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
const FileRangeBlobItem* fileRangeItem = item->toFileRangeBlobItem();
if (fileRangeItem) {
appendFileRange(fileItem->path(), fileRangeItem->start(), fileRangeItem->size(), fileRangeItem->snapshotModificationTime(), shouldGenerateFile);
@@ -195,7 +195,7 @@ void FormData::appendItem(const BlobItem* item, bool shouldGenerateFile)
appendFile(fileItem->path(), shouldGenerateFile);
}
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
void FormData::appendFileRange(const String& filename, long long start, long long length, double expectedModificationTime, bool shouldGenerateFile)
{
m_elements.append(FormDataElement(filename, start, length, expectedModificationTime, shouldGenerateFile));
@@ -245,7 +245,7 @@ void FormData::appendKeyValuePairItems(const BlobItemList& items, const TextEnco
FormDataBuilder::addFilenameToMultiPartHeader(header, encoding, fileName);
// If the item is sliced from a file, do not add the content type.
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
if (!fileName.isEmpty() && !value->toFileRangeBlobItem()) {
#else
if (!fileName.isEmpty()) {