diff options
Diffstat (limited to 'WebCore/platform/network/FormData.h')
-rw-r--r-- | WebCore/platform/network/FormData.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/WebCore/platform/network/FormData.h b/WebCore/platform/network/FormData.h index 95eb258..a1964e3 100644 --- a/WebCore/platform/network/FormData.h +++ b/WebCore/platform/network/FormData.h @@ -21,6 +21,7 @@ #define FormData_h #include "PlatformString.h" +#include <wtf/Forward.h> #include <wtf/RefCounted.h> #include <wtf/Vector.h> @@ -36,7 +37,7 @@ public: FormDataElement() : m_type(data) { } FormDataElement(const Vector<char>& array) : m_type(data), m_data(array) { } -#if ENABLE(BLOB_SLICE) +#if ENABLE(BLOB) FormDataElement(const String& filename, long long fileStart, long long fileLength, double expectedFileModificationTime, bool shouldGenerateFile) : m_type(encodedFile), m_filename(filename), m_fileStart(fileStart), m_fileLength(fileLength), m_expectedFileModificationTime(expectedFileModificationTime), m_shouldGenerateFile(shouldGenerateFile) { } #else FormDataElement(const String& filename, bool shouldGenerateFile) : m_type(encodedFile), m_filename(filename), m_shouldGenerateFile(shouldGenerateFile) { } @@ -45,7 +46,7 @@ public: enum { data, encodedFile } m_type; Vector<char> m_data; String m_filename; -#if ENABLE(BLOB_SLICE) +#if ENABLE(BLOB) long long m_fileStart; long long m_fileLength; double m_expectedFileModificationTime; @@ -53,7 +54,7 @@ public: String m_generatedFilename; bool m_shouldGenerateFile; -#if ENABLE(BLOB_SLICE) +#if ENABLE(BLOB) static const long long toEndOfFile; static const double doNotCheckFileChange; #endif @@ -68,7 +69,7 @@ inline bool operator==(const FormDataElement& a, const FormDataElement& b) return false; if (a.m_data != b.m_data) return false; -#if ENABLE(BLOB_SLICE) +#if ENABLE(BLOB) if (a.m_filename != b.m_filename || a.m_fileStart != b.m_fileStart || a.m_fileLength != b.m_fileLength || a.m_expectedFileModificationTime != b.m_expectedFileModificationTime) #else if (a.m_filename != b.m_filename) @@ -87,7 +88,7 @@ class FormData : public RefCounted<FormData> { public: static PassRefPtr<FormData> create(); static PassRefPtr<FormData> create(const void*, size_t); - static PassRefPtr<FormData> create(const WTF::CString&); + static PassRefPtr<FormData> create(const CString&); static PassRefPtr<FormData> create(const Vector<char>&); static PassRefPtr<FormData> create(const BlobItemList&, const TextEncoding&); static PassRefPtr<FormData> createMultiPart(const BlobItemList&, const TextEncoding&, Document*); @@ -98,7 +99,7 @@ public: void appendData(const void* data, size_t); void appendItems(const BlobItemList&); void appendFile(const String& filename, bool shouldGenerateFile = false); -#if ENABLE(BLOB_SLICE) +#if ENABLE(BLOB) void appendFileRange(const String& filename, long long start, long long length, double expectedModificationTime, bool shouldGenerateFile = false); #endif |