Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 12 * Library General Public License for more details. | 12 * Library General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU Library General Public License | 14 * You should have received a copy of the GNU Library General Public License |
| 15 * along with this library; see the file COPYING.LIB. If not, write to | 15 * along with this library; see the file COPYING.LIB. If not, write to |
| 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 17 * Boston, MA 02110-1301, USA. | 17 * Boston, MA 02110-1301, USA. |
| 18 * | 18 * |
| 19 */ | 19 */ |
| 20 | 20 |
| 21 #ifndef FormDataList_h | 21 #ifndef FormDataList_h |
| 22 #define FormDataList_h | 22 #define FormDataList_h |
| 23 | 23 |
| 24 #include "core/fileapi/Blob.h" | 24 #include "core/fileapi/Blob.h" |
| 25 #include "heap/Handle.h" | |
| 25 #include "platform/network/FormData.h" | 26 #include "platform/network/FormData.h" |
| 26 #include "wtf/Forward.h" | 27 #include "wtf/Forward.h" |
| 27 #include "wtf/text/CString.h" | 28 #include "wtf/text/CString.h" |
| 28 #include "wtf/text/TextEncoding.h" | 29 #include "wtf/text/TextEncoding.h" |
| 29 | 30 |
| 30 namespace WebCore { | 31 namespace WebCore { |
| 31 | 32 |
| 32 class FormDataList { | 33 class FormDataList { |
| 33 public: | 34 public: |
| 35 // This class is only allocated as part of vectors, and its | |
| 36 // heap-allocated member is visited when tracing the vector. | |
| 37 // See also its WTF::NeedsTracing specialization below. | |
|
haraken
2014/02/27 01:19:29
Nit: I'd drop this comment, as we don't add this k
sof
2014/02/27 06:48:07
alright, but there is one next to the use in CSSGr
| |
| 34 class Item { | 38 class Item { |
| 39 ALLOW_ONLY_INLINE_ALLOCATION(); | |
| 35 public: | 40 public: |
| 36 Item() { } | 41 Item() { } |
| 37 Item(const WTF::CString& data) : m_data(data) { } | 42 Item(const WTF::CString& data) : m_data(data) { } |
| 38 Item(PassRefPtr<Blob> blob, const String& filename) : m_blob(blob), m_fi lename(filename) { } | 43 Item(PassRefPtrWillBeRawPtr<Blob> blob, const String& filename) : m_blob (blob), m_filename(filename) { } |
| 39 | 44 |
| 40 const WTF::CString& data() const { return m_data; } | 45 const WTF::CString& data() const { return m_data; } |
| 41 Blob* blob() const { return m_blob.get(); } | 46 Blob* blob() const { return m_blob.get(); } |
| 42 const String& filename() const { return m_filename; } | 47 const String& filename() const { return m_filename; } |
| 43 | 48 |
| 49 void trace(Visitor*); | |
| 50 | |
| 44 private: | 51 private: |
| 45 WTF::CString m_data; | 52 WTF::CString m_data; |
| 46 RefPtr<Blob> m_blob; | 53 RefPtrWillBeMember<Blob> m_blob; |
| 47 String m_filename; | 54 String m_filename; |
| 48 }; | 55 }; |
| 49 | 56 |
| 50 FormDataList(const WTF::TextEncoding&); | 57 FormDataList(const WTF::TextEncoding&); |
| 51 | 58 |
| 52 void appendData(const String& key, const String& value) | 59 void appendData(const String& key, const String& value) |
| 53 { | 60 { |
| 54 appendString(key); | 61 appendString(key); |
| 55 appendString(value); | 62 appendString(value); |
| 56 } | 63 } |
| 57 void appendData(const String& key, const CString& value) | 64 void appendData(const String& key, const CString& value) |
| 58 { | 65 { |
| 59 appendString(key); | 66 appendString(key); |
| 60 appendString(value); | 67 appendString(value); |
| 61 } | 68 } |
| 62 void appendData(const String& key, int value) | 69 void appendData(const String& key, int value) |
| 63 { | 70 { |
| 64 appendString(key); | 71 appendString(key); |
| 65 appendString(String::number(value)); | 72 appendString(String::number(value)); |
| 66 } | 73 } |
| 67 void appendBlob(const String& key, PassRefPtr<Blob> blob, const String& file name = String()) | 74 void appendBlob(const String& key, PassRefPtrWillBeRawPtr<Blob> blob, const String& filename = String()) |
| 68 { | 75 { |
| 69 appendString(key); | 76 appendString(key); |
| 70 appendBlob(blob, filename); | 77 appendBlob(blob, filename); |
| 71 } | 78 } |
| 72 | 79 |
| 73 const Vector<Item>& items() const { return m_items; } | 80 const WillBeHeapVector<Item>& items() const { return m_items; } |
| 74 const WTF::TextEncoding& encoding() const { return m_encoding; } | 81 const WTF::TextEncoding& encoding() const { return m_encoding; } |
| 75 | 82 |
| 76 PassRefPtr<FormData> createFormData(const WTF::TextEncoding&, FormData::Enco dingType = FormData::FormURLEncoded); | 83 PassRefPtr<FormData> createFormData(const WTF::TextEncoding&, FormData::Enco dingType = FormData::FormURLEncoded); |
| 77 PassRefPtr<FormData> createMultiPartFormData(const WTF::TextEncoding&); | 84 PassRefPtr<FormData> createMultiPartFormData(const WTF::TextEncoding&); |
| 78 | 85 |
| 86 void trace(Visitor*); | |
| 87 | |
| 79 private: | 88 private: |
| 80 void appendKeyValuePairItemsTo(FormData*, const WTF::TextEncoding&, bool isM ultiPartForm, FormData::EncodingType = FormData::FormURLEncoded); | 89 void appendKeyValuePairItemsTo(FormData*, const WTF::TextEncoding&, bool isM ultiPartForm, FormData::EncodingType = FormData::FormURLEncoded); |
| 81 | 90 |
| 82 void appendString(const CString&); | 91 void appendString(const CString&); |
| 83 void appendString(const String&); | 92 void appendString(const String&); |
| 84 void appendBlob(PassRefPtr<Blob>, const String& filename); | 93 void appendBlob(PassRefPtrWillBeRawPtr<Blob>, const String& filename); |
| 85 | 94 |
| 86 WTF::TextEncoding m_encoding; | 95 WTF::TextEncoding m_encoding; |
| 87 Vector<Item> m_items; | 96 WillBeHeapVector<Item> m_items; |
| 88 }; | 97 }; |
| 89 | 98 |
| 90 } // namespace WebCore | 99 } // namespace WebCore |
| 91 | 100 |
| 101 // FIXME: oilpan: remove once traceability can be derived/inferred. | |
| 102 namespace WTF { | |
| 103 template<> | |
| 104 struct NeedsTracing<WebCore::FormDataList::Item> { | |
| 105 static const bool value = true; | |
| 106 }; | |
| 107 } | |
| 108 | |
| 92 #endif // FormDataList_h | 109 #endif // FormDataList_h |
| OLD | NEW |