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

Source/core/html/DOMFormData.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/DOMFormData.h"
 
 #include "core/fileapi/Blob.h"
+#include "core/fileapi/File.h"
 #include "core/html/HTMLFormElement.h"
 #include "wtf/text/TextEncoding.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
+namespace {
+
+class DOMFormDataIterationSource final : public PairIterable<String, FormDataEntryValue>::IterationSource {
+public:
+    DOMFormDataIterationSource(DOMFormData* formData) : m_formData(formData), m_current(0) { }
+
+    virtual bool next(ScriptState* scriptState, String& key, FormDataEntryValue& value, ExceptionState& exceptionState) override

[tyoshino (SeeGerritForStatus), 2015/01/22 12:53:10]

can omit virtual?

[jsbell, 2015/01/22 19:05:38]

Done.

+    {
+        if (m_current >= m_formData->size())
+            return false;
+
+        const FormDataList::Entry entry = m_formData->getEntry(m_current++);
+        key = entry.name();
+        if (entry.isString())
+            value.setUSVString(entry.string());
+        else if (entry.isFile())
+            value.setFile(entry.file());
+        else
+            ASSERT_NOT_REACHED();
+        return true;
+    }
+
+    virtual void trace(Visitor* visitor)

[tyoshino (SeeGerritForStatus), 2015/01/22 12:53:10]

override?

[jsbell, 2015/01/22 19:05:38]

Done.

+    {
+        visitor->trace(m_formData);
+        PairIterable<String, FormDataEntryValue>::IterationSource::trace(visitor);
+    }
+
+private:
+    const RefPtrWillBeMember<DOMFormData> m_formData;
+    size_t m_current;
+};
+
+} // namespace
+
 DOMFormData::DOMFormData(const WTF::TextEncoding& encoding)
     : FormDataList(encoding)
 {
 }
 
 DOMFormData::DOMFormData(HTMLFormElement* form)
     : FormDataList(UTF8Encoding())
 {
     if (!form)
         return;
 
     for (unsigned i = 0; i < form->associatedElements().size(); ++i) {
         FormAssociatedElement* element = form->associatedElements()[i];
         if (!toHTMLElement(element)->isDisabledFormControl())
             element->appendFormData(*this, true);
     }
 }
 
 void DOMFormData::append(const String& name, const String& value)
 {
     appendData(name, value);
 }
 
 void DOMFormData::append(const String& name, Blob* blob, const String& filename)
 {
     appendBlob(name, blob, filename);
 }
 
+void DOMFormData::get(const String& name, FormDataEntryValue& result)
+{
+    Entry entry = getEntry(name);
+    if (entry.isString())
+        result.setUSVString(entry.string());
+    else if (entry.isFile())
+        result.setFile(entry.file());
+    else
+        ASSERT(entry.isNone());
+}
+
+Vector<FormDataEntryValue> DOMFormData::getAll(const String& name)
+{
+    Vector<FormDataEntryValue> results;
+    WillBeHeapVector<FormDataList::Entry> entries = FormDataList::getAll(name);
+    for (size_t i = 0; i < entries.size(); ++i) {
+        const FormDataList::Entry& entry = entries[i];
+        ASSERT(entry.name() == name);
+        FormDataEntryValue value;
+        if (entry.isString())
+            value.setUSVString(entry.string());
+        else if (entry.isFile())
+            value.setFile(entry.file());
+        else
+            ASSERT_NOT_REACHED();
+        results.append(value);
+    }
+    ASSERT(results.size() == entries.size());
+    return results;
+}
+
+void DOMFormData::set(const String& name, const String& value)
+{
+    setData(name, value);
+}
+
+void DOMFormData::set(const String& name, Blob* blob, const String& filename)
+{
+    setBlob(name, blob, filename);
+}
+
+PairIterable<String, FormDataEntryValue>::IterationSource* DOMFormData::startIteration(ScriptState*, ExceptionState&)
+{
+    return new DOMFormDataIterationSource(this);
+}
+
 } // namespace blink