New FormData methods: get, getAll, has, set, delete and iterable

Source/core/html/FormDataList.h

 /*
  * Copyright (C) 2005, 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 FormDataList_h
 #define FormDataList_h
 
 #include "core/fileapi/Blob.h"
+#include "core/fileapi/File.h"
 #include "platform/heap/Handle.h"
 #include "platform/network/FormData.h"
 #include "wtf/Forward.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/TextEncoding.h"
 
 namespace blink {
 
 class FormDataList {
 public:
+    class EntryValue {

[sof, 2014/09/12 15:21:26]

Add FINAL

[sof, 2014/09/12 15:21:26]

Add ALLOW_ONLY_INLINE_ALLOCATION();

[jsbell, 2014/09/12 16:30:09]

Done.

[jsbell, 2014/09/12 16:30:10]

Done.

+    public:
+        enum Type { None, StringType, FileType };
+
+        EntryValue() : m_type(None) { }
+        EntryValue(const String& string) : m_type(StringType), m_string(string) { }
+        EntryValue(PassRefPtrWillBeRawPtr<File> file) : m_type(FileType), m_file(file) { }
+
+        bool isNone() const { return m_type == None; }
+        bool isString() const { return m_type == StringType; }
+        bool isFile() const { return m_type == FileType; }
+
+        const String& string() const { ASSERT(m_type == StringType); return m_string; }
+        PassRefPtrWillBeRawPtr<File> file() const { ASSERT(m_type == FileType); return m_file; }
+

[sof, 2014/09/12 15:21:26]

Add 

  void trace(Visitor*);

and define it as

  void FormDataList::EntryValue::trace(Visitor* visitor)
  {
      visitor->trace(m_file);
  }

[jsbell, 2014/09/12 16:30:09]

Done.

+    private:
+        Type m_type;
+        String m_string;
+        RefPtrWillBeMember<File> m_file;
+    };
+
     class Item {
         ALLOW_ONLY_INLINE_ALLOCATION();
     public:
         Item() { }
         Item(const WTF::CString& data) : m_data(data) { }
         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; }
@@ skipping 22 matching lines @@
     {
         appendString(key);
         appendString(String::number(value));
     }
     void appendBlob(const String& key, PassRefPtrWillBeRawPtr<Blob> blob, const String& filename = String())
     {
         appendString(key);
         appendBlob(blob, filename);
     }
 
+    void deleteItem(const String& key);
+    EntryValue getItem(const String& key) const;
+    Vector<EntryValue> getAll(const String& key) const;

[sof, 2014/09/12 15:21:26]

Vector => WillBeHeapVector

[jsbell, 2014/09/12 16:30:10]

Done.

+    bool hasItem(const String& key) const;
+    void setBlob(const String& key, PassRefPtrWillBeRawPtr<Blob>, const String& filename);
+    void setData(const String& key, const String& value);
+
     const WillBeHeapVector<Item>& items() const { return m_items; }
     const WTF::TextEncoding& encoding() const { return m_encoding; }
 
     PassRefPtr<FormData> createFormData(FormData::EncodingType = FormData::FormURLEncoded);
     PassRefPtr<FormData> createMultiPartFormData();
 
     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(PassRefPtrWillBeRawPtr<Blob>, const String& filename);
+    void setItem(const String& key, const Item&);
+    EntryValue itemToEntryValue(const Item&) const;
+    CString encodeAndNormalize(const String& key) const;
 
     WTF::TextEncoding m_encoding;
     WillBeHeapVector<Item> m_items;
 };
 
 } // namespace blink
 
 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::FormDataList::Item);
 
 #endif // FormDataList_h