| Index: WebCore/platform/network/FormData.h
|
| ===================================================================
|
| --- WebCore/platform/network/FormData.h (revision 132804)
|
| +++ WebCore/platform/network/FormData.h (working copy)
|
| @@ -20,6 +20,7 @@
|
| #ifndef FormData_h
|
| #define FormData_h
|
|
|
| +#include "BlobData.h"
|
| #include "KURL.h"
|
| #include <wtf/Forward.h>
|
| #include <wtf/RefCounted.h>
|
| @@ -28,6 +29,7 @@
|
|
|
| namespace WebCore {
|
|
|
| +class BlobDataHandle;
|
| class Document;
|
| class FormDataList;
|
| class TextEncoding;
|
| @@ -39,7 +41,7 @@
|
|
|
| #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) { }
|
| - explicit FormDataElement(const KURL& blobURL) : m_type(encodedBlob), m_url(blobURL) { }
|
| + explicit FormDataElement(PassRefPtr<BlobDataHandle> blobDataHandle) : m_type(encodedBlob), m_blobDataHandle(blobDataHandle) { }
|
| #else
|
| FormDataElement(const String& filename, bool shouldGenerateFile) : m_type(encodedFile), m_filename(filename), m_shouldGenerateFile(shouldGenerateFile) { }
|
| #endif
|
| @@ -60,7 +62,8 @@
|
| Vector<char> m_data;
|
| String m_filename;
|
| #if ENABLE(BLOB)
|
| - KURL m_url; // For Blob or URL.
|
| + RefPtr<BlobDataHandle> m_blobDataHandle;
|
| + KURL m_url; // For filesystem URL type.
|
| long long m_fileStart;
|
| long long m_fileLength;
|
| double m_expectedFileModificationTime;
|
| @@ -124,7 +127,7 @@
|
| void appendFile(const String& filePath, bool shouldGenerateFile = false);
|
| #if ENABLE(BLOB)
|
| void appendFileRange(const String& filename, long long start, long long length, double expectedModificationTime, bool shouldGenerateFile = false);
|
| - void appendBlob(const KURL& blobURL);
|
| + void appendBlob(PassRefPtr<BlobDataHandle>);
|
| #endif
|
| #if ENABLE(FILE_SYSTEM)
|
| void appendURL(const KURL&);
|
|
|