BlobBuilder/FormData refactor attempt

WebCore/platform/network/FormData.h

 /*
  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB. If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef FormData_h
 #define FormData_h
 
+#include "BlobItem.h"
 #include "PlatformString.h"
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
-class DOMFormData;
 class Document;
+class TextEncoding;
 
+// A wrapper class of BlobItem for FormData.
 class FormDataElement {
 public:
-    FormDataElement() : m_type(data) { }
+    FormDataElement() : m_data(0) { }
     FormDataElement(const Vector<char>& array) : m_type(data), m_data(array) { }
+
 #if ENABLE(BLOB_SLICE)
-    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) { }
+    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) { }
 #endif
 
     enum { data, encodedFile } m_type;
     Vector<char> m_data;
     String m_filename;
 #if ENABLE(BLOB_SLICE)
     long long m_fileStart;
     long long m_fileLength;
     double m_expectedFileModificationTime;
+
+    static const long long toEndOfFile;
+    static const double doNotCheckFileChange;
 #endif
     String m_generatedFilename;
     bool m_shouldGenerateFile;
 };
 
 inline bool operator==(const FormDataElement& a, const FormDataElement& b)
 {
     if (&a == &b)
         return true;
-    
+
     if (a.m_type != b.m_type)
         return false;
     if (a.m_data != b.m_data)
         return false;
 #if ENABLE(BLOB_SLICE)
     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)
 #endif
         return false;
 
     return true;
 }
- 
+
 inline bool operator!=(const FormDataElement& a, const FormDataElement& b)
 {
     return !(a == b);
 }
- 
+
 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 Vector<char>&);
-    static PassRefPtr<FormData> create(const DOMFormData&);
-    static PassRefPtr<FormData> createMultiPart(const DOMFormData&, Document*);
+    static PassRefPtr<FormData> create(const BlobItemList&, const TextEncoding&);
+    static PassRefPtr<FormData> createMultiPart(const BlobItemList&, const TextEncoding&, Document*);
     PassRefPtr<FormData> copy() const;
     PassRefPtr<FormData> deepCopy() const;
     ~FormData();
-    
+
     void appendData(const void* data, size_t);
+    void appendItems(const BlobItemList&);
     void appendFile(const String& filename, bool shouldGenerateFile = false);
 #if ENABLE(BLOB_SLICE)
     void appendFileRange(const String& filename, long long start, long long length, double expectedModificationTime, bool shouldGenerateFile = false);
 #endif
 
     void flatten(Vector<char>&) const; // omits files
     String flattenToString() const; // omits files
 
     bool isEmpty() const { return m_elements.isEmpty(); }
     const Vector<FormDataElement>& elements() const { return m_elements; }
     const Vector<char>& boundary() const { return m_boundary; }
 
     void generateFiles(Document*);
     void removeGeneratedFilesIfNeeded();
 
     bool alwaysStream() const { return m_alwaysStream; }
     void setAlwaysStream(bool alwaysStream) { m_alwaysStream = alwaysStream; }
 
     // Identifies a particular form submission instance.  A value of 0 is used
     // to indicate an unspecified identifier.
     void setIdentifier(int64_t identifier) { m_identifier = identifier; }
     int64_t identifier() const { return m_identifier; }
 
 private:
     FormData();
     FormData(const FormData&);
 
-    void appendDOMFormData(const DOMFormData& domFormData, bool isMultiPartForm, Document* document);
+    void appendItem(const BlobItem*, bool shouldGenerateFile);
+    void appendKeyValuePairItems(const BlobItemList&, const TextEncoding&, bool isMultiPartForm, Document*);
 
     Vector<FormDataElement> m_elements;
+
     int64_t m_identifier;
     bool m_hasGeneratedFiles;
     bool m_alwaysStream;
     Vector<char> m_boundary;
 };
 
 inline bool operator==(const FormData& a, const FormData& b)
 {
     return a.elements() == b.elements();
 }
 
 inline bool operator!=(const FormData& a, const FormData& b)
 {
-    return a.elements() != b.elements();
+    return !(a == b);
 }
 
 } // namespace WebCore
 
 #endif