| Index: Source/core/html/FormDataList.h
|
| diff --git a/Source/core/html/FormDataList.h b/Source/core/html/FormDataList.h
|
| index 123e566f62133fc13e5ff47d58e128c468ed689e..ceeb5c721ca676b8ac257b30183675f0d834c402 100644
|
| --- a/Source/core/html/FormDataList.h
|
| +++ b/Source/core/html/FormDataList.h
|
| @@ -22,6 +22,7 @@
|
| #define FormDataList_h
|
|
|
| #include "core/fileapi/Blob.h"
|
| +#include "heap/Handle.h"
|
| #include "platform/network/FormData.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/text/CString.h"
|
| @@ -35,15 +36,17 @@ public:
|
| public:
|
| Item() { }
|
| Item(const WTF::CString& data) : m_data(data) { }
|
| - Item(PassRefPtr<Blob> blob, const String& filename) : m_blob(blob), m_filename(filename) { }
|
| + Item(PassRefPtrWillBeRawPtr<Blob> blob, const String& filename) : m_blob(blob), m_filename(filename) { }
|
|
|
| const WTF::CString& data() const { return m_data; }
|
| Blob* blob() const { return m_blob.get(); }
|
| const String& filename() const { return m_filename; }
|
|
|
| + void trace(Visitor*);
|
| +
|
| private:
|
| WTF::CString m_data;
|
| - RefPtr<Blob> m_blob;
|
| + RefPtrWillBeMember<Blob> m_blob;
|
| String m_filename;
|
| };
|
|
|
| @@ -64,27 +67,29 @@ public:
|
| appendString(key);
|
| appendString(String::number(value));
|
| }
|
| - void appendBlob(const String& key, PassRefPtr<Blob> blob, const String& filename = String())
|
| + void appendBlob(const String& key, PassRefPtrWillBeRawPtr<Blob> blob, const String& filename = String())
|
| {
|
| appendString(key);
|
| appendBlob(blob, filename);
|
| }
|
|
|
| - const Vector<Item>& items() const { return m_items; }
|
| + const WillBeHeapVector<Item>& items() const { return m_items; }
|
| const WTF::TextEncoding& encoding() const { return m_encoding; }
|
|
|
| PassRefPtr<FormData> createFormData(const WTF::TextEncoding&, FormData::EncodingType = FormData::FormURLEncoded);
|
| PassRefPtr<FormData> createMultiPartFormData(const WTF::TextEncoding&);
|
|
|
| + void trace(Visitor*);
|
| +
|
| private:
|
| void appendKeyValuePairItemsTo(FormData*, const WTF::TextEncoding&, bool isMultiPartForm, FormData::EncodingType = FormData::FormURLEncoded);
|
|
|
| void appendString(const CString&);
|
| void appendString(const String&);
|
| - void appendBlob(PassRefPtr<Blob>, const String& filename);
|
| + void appendBlob(PassRefPtrWillBeRawPtr<Blob>, const String& filename);
|
|
|
| WTF::TextEncoding m_encoding;
|
| - Vector<Item> m_items;
|
| + WillBeHeapVector<Item> m_items;
|
| };
|
|
|
| } // namespace WebCore
|
|
|