Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(546)

Side by Side Diff: Source/platform/network/EncodedFormData.h

Issue 1311923004: Rename FormData/FormDataBuilder to EncodedFormData/FormDataEncoder respectively. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: update comments Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/platform/exported/WebHTTPBody.cpp ('k') | Source/platform/network/EncodedFormData.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2006, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2008, 2011 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 #ifndef FormData_h 20 #ifndef EncodedFormData_h
21 #define FormData_h 21 #define EncodedFormData_h
22 22
23 #include "platform/blob/BlobData.h" 23 #include "platform/blob/BlobData.h"
24 #include "platform/weborigin/KURL.h" 24 #include "platform/weborigin/KURL.h"
25 #include "wtf/Forward.h" 25 #include "wtf/Forward.h"
26 #include "wtf/RefCounted.h" 26 #include "wtf/RefCounted.h"
27 #include "wtf/Vector.h" 27 #include "wtf/Vector.h"
28 #include "wtf/text/WTFString.h" 28 #include "wtf/text/WTFString.h"
29 29
30 namespace blink { 30 namespace blink {
31 31
32 class BlobDataHandle; 32 class BlobDataHandle;
33 33
34 class PLATFORM_EXPORT FormDataElement { 34 class PLATFORM_EXPORT FormDataElement final {
35 public: 35 public:
36 FormDataElement() : m_type(data) { } 36 FormDataElement() : m_type(data) { }
37 explicit FormDataElement(const Vector<char>& array) : m_type(data), m_data(a rray) { } 37 explicit FormDataElement(const Vector<char>& array) : m_type(data), m_data(a rray) { }
38 38
39 FormDataElement(const String& filename, long long fileStart, long long fileL ength, double expectedFileModificationTime) : m_type(encodedFile), m_filename(fi lename), m_fileStart(fileStart), m_fileLength(fileLength), m_expectedFileModific ationTime(expectedFileModificationTime) { } 39 FormDataElement(const String& filename, long long fileStart, long long fileL ength, double expectedFileModificationTime) : m_type(encodedFile), m_filename(fi lename), m_fileStart(fileStart), m_fileLength(fileLength), m_expectedFileModific ationTime(expectedFileModificationTime) { }
40 explicit FormDataElement(const String& blobUUID, PassRefPtr<BlobDataHandle> optionalHandle) : m_type(encodedBlob), m_blobUUID(blobUUID), m_optionalBlobDataH andle(optionalHandle) { } 40 explicit FormDataElement(const String& blobUUID, PassRefPtr<BlobDataHandle> optionalHandle) : m_type(encodedBlob), m_blobUUID(blobUUID), m_optionalBlobDataH andle(optionalHandle) { }
41 FormDataElement(const KURL& fileSystemURL, long long start, long long length , double expectedFileModificationTime) : m_type(encodedFileSystemURL), m_fileSys temURL(fileSystemURL), m_fileStart(start), m_fileLength(length), m_expectedFileM odificationTime(expectedFileModificationTime) { } 41 FormDataElement(const KURL& fileSystemURL, long long start, long long length , double expectedFileModificationTime) : m_type(encodedFileSystemURL), m_fileSys temURL(fileSystemURL), m_fileStart(start), m_fileLength(length), m_expectedFileM odificationTime(expectedFileModificationTime) { }
42 42
43 bool isSafeToSendToAnotherThread() const; 43 bool isSafeToSendToAnotherThread() const;
44 44
(...skipping 30 matching lines...) Expand all
75 return a.m_fileSystemURL == b.m_fileSystemURL; 75 return a.m_fileSystemURL == b.m_fileSystemURL;
76 76
77 return true; 77 return true;
78 } 78 }
79 79
80 inline bool operator!=(const FormDataElement& a, const FormDataElement& b) 80 inline bool operator!=(const FormDataElement& a, const FormDataElement& b)
81 { 81 {
82 return !(a == b); 82 return !(a == b);
83 } 83 }
84 84
85 class PLATFORM_EXPORT FormData : public RefCounted<FormData> { 85 class PLATFORM_EXPORT EncodedFormData : public RefCounted<EncodedFormData> {
86 public: 86 public:
87 enum EncodingType { 87 enum EncodingType {
88 FormURLEncoded, // for application/x-www-form-urlencoded 88 FormURLEncoded, // for application/x-www-form-urlencoded
89 TextPlain, // for text/plain 89 TextPlain, // for text/plain
90 MultipartFormData // for multipart/form-data 90 MultipartFormData // for multipart/form-data
91 }; 91 };
92 92
93 static PassRefPtr<FormData> create(); 93 static PassRefPtr<EncodedFormData> create();
94 static PassRefPtr<FormData> create(const void*, size_t); 94 static PassRefPtr<EncodedFormData> create(const void*, size_t);
95 static PassRefPtr<FormData> create(const CString&); 95 static PassRefPtr<EncodedFormData> create(const CString&);
96 static PassRefPtr<FormData> create(const Vector<char>&); 96 static PassRefPtr<EncodedFormData> create(const Vector<char>&);
97 PassRefPtr<FormData> copy() const; 97 PassRefPtr<EncodedFormData> copy() const;
98 PassRefPtr<FormData> deepCopy() const; 98 PassRefPtr<EncodedFormData> deepCopy() const;
99 ~FormData(); 99 ~EncodedFormData();
100 100
101 void appendData(const void* data, size_t); 101 void appendData(const void* data, size_t);
102 void appendFile(const String& filePath); 102 void appendFile(const String& filePath);
103 void appendFileRange(const String& filename, long long start, long long leng th, double expectedModificationTime); 103 void appendFileRange(const String& filename, long long start, long long leng th, double expectedModificationTime);
104 void appendBlob(const String& blobUUID, PassRefPtr<BlobDataHandle> optionalH andle); 104 void appendBlob(const String& blobUUID, PassRefPtr<BlobDataHandle> optionalH andle);
105 void appendFileSystemURL(const KURL&); 105 void appendFileSystemURL(const KURL&);
106 void appendFileSystemURLRange(const KURL&, long long start, long long length , double expectedModificationTime); 106 void appendFileSystemURLRange(const KURL&, long long start, long long length , double expectedModificationTime);
107 107
108 void flatten(Vector<char>&) const; // omits files 108 void flatten(Vector<char>&) const; // omits files
109 String flattenToString() const; // omits files 109 String flattenToString() const; // omits files
(...skipping 14 matching lines...) Expand all
124 124
125 static EncodingType parseEncodingType(const String& type) 125 static EncodingType parseEncodingType(const String& type)
126 { 126 {
127 if (equalIgnoringCase(type, "text/plain")) 127 if (equalIgnoringCase(type, "text/plain"))
128 return TextPlain; 128 return TextPlain;
129 if (equalIgnoringCase(type, "multipart/form-data")) 129 if (equalIgnoringCase(type, "multipart/form-data"))
130 return MultipartFormData; 130 return MultipartFormData;
131 return FormURLEncoded; 131 return FormURLEncoded;
132 } 132 }
133 133
134 // Size of the elements making up the FormData. 134 // Size of the elements making up the EncodedFormData.
135 unsigned long long sizeInBytes() const; 135 unsigned long long sizeInBytes() const;
136 136
137 bool isSafeToSendToAnotherThread() const; 137 bool isSafeToSendToAnotherThread() const;
138 138
139 private: 139 private:
140 FormData(); 140 EncodedFormData();
141 FormData(const FormData&); 141 EncodedFormData(const EncodedFormData&);
142 142
143 Vector<FormDataElement> m_elements; 143 Vector<FormDataElement> m_elements;
144 144
145 int64_t m_identifier; 145 int64_t m_identifier;
146 Vector<char> m_boundary; 146 Vector<char> m_boundary;
147 bool m_containsPasswordData; 147 bool m_containsPasswordData;
148 }; 148 };
149 149
150 inline bool operator==(const FormData& a, const FormData& b) 150 inline bool operator==(const EncodedFormData& a, const EncodedFormData& b)
151 { 151 {
152 return a.elements() == b.elements(); 152 return a.elements() == b.elements();
153 } 153 }
154 154
155 inline bool operator!=(const FormData& a, const FormData& b) 155 inline bool operator!=(const EncodedFormData& a, const EncodedFormData& b)
156 { 156 {
157 return !(a == b); 157 return !(a == b);
158 } 158 }
159 159
160 } // namespace blink 160 } // namespace blink
161 161
162 #endif 162 #endif
OLDNEW
« no previous file with comments | « Source/platform/exported/WebHTTPBody.cpp ('k') | Source/platform/network/EncodedFormData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698