Remove FormDataList::Entry.

Fold FormDataList::getEntry() and getAll() into DOMFormData.  So, no one uses
FormDataList::Entry.
This CL has no behavior changes.

BUG=528840

Review URL: https://codereview.chromium.org/1312333005

git-svn-id: svn://svn.chromium.org/blink/trunk@201966 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/html/DOMFormData.cpp

@@ -137,13 +137,18 @@ void DOMFormData::get(const String& name, FormDataEntryValue& result)
 {
     if (m_opaque)
         return;
-    Entry entry = getEntry(name);
-    if (entry.isString())
-        result.setUSVString(entry.string());
-    else if (entry.isFile())
-        result.setFile(entry.file());
-    else
-        ASSERT(entry.isNone());
+    const CString encodedName = encodeAndNormalize(name);
+    for (const Item& entry : items()) {
+        if (entry.key() == encodedName) {
+            if (entry.isString()) {
+                result.setUSVString(decode(entry.data()));
+            } else {
+                ASSERT(entry.isFile());
+                result.setFile(entry.file());
+            }
+            return;
+        }
+    }
 }
 
 HeapVector<FormDataEntryValue> DOMFormData::getAll(const String& name)
@@ -153,19 +158,19 @@ HeapVector<FormDataEntryValue> DOMFormData::getAll(const String& name)
     if (m_opaque)
         return results;
 
-    HeapVector<FormDataList::Entry> entries = FormDataList::getAll(name);
-    for (const FormDataList::Entry& entry : entries) {
-        ASSERT(entry.name() == name);
+    const CString encodedName = encodeAndNormalize(name);
+    for (const Item& entry : items()) {
+        if (entry.key() != encodedName)
+            continue;
         FormDataEntryValue value;
-        if (entry.isString())
-            value.setUSVString(entry.string());
-        else if (entry.isFile())
+        if (entry.isString()) {
+            value.setUSVString(decode(entry.data()));
+        } else {
+            ASSERT(entry.isFile());
             value.setFile(entry.file());
-        else
-            ASSERT_NOT_REACHED();
+        }
         results.append(value);
     }
-    ASSERT(results.size() == entries.size());
     return results;
 }
 

third_party/WebKit/Source/core/html/DOMFormDataTest.cpp

@@ -20,8 +20,9 @@ TEST(DOMFormDataTest, opacityGet)
     EXPECT_TRUE(result.isUSVString());
     EXPECT_EQ("value1", result.getAsUSVString());
 
-    FormDataList::Entry entry = fd->getEntry("name1");
-    EXPECT_EQ("value1", entry.string());
+    const FormDataList::Item& entry = fd->items()[0];
+    EXPECT_STREQ("name1", entry.key().data());
+    EXPECT_STREQ("value1", entry.data().data());
 
     fd->makeOpaque();
 
@@ -31,8 +32,9 @@ TEST(DOMFormDataTest, opacityGet)
     EXPECT_TRUE(opaqueResult.isNull());
 
     // Internal interface should be uneffected.
-    FormDataList::Entry opaqueEntry = fd->getEntry("name1");
-    EXPECT_EQ("value1", opaqueEntry.string());
+    const FormDataList::Item& entry2 = fd->items()[0];
+    EXPECT_STREQ("name1", entry2.key().data());
+    EXPECT_STREQ("value1", entry2.data().data());
 }
 
 TEST(DOMFormDataTest, opacityGetAll)

third_party/WebKit/Source/core/html/FormDataList.cpp

@@ -38,41 +38,6 @@ void FormDataList::appendItem(const FormDataList::Item& item)
     m_items.append(item);
 }
 
-FormDataList::Entry FormDataList::getEntry(const String& key) const
-{
-    const CString keyData = encodeAndNormalize(key);
-    for (const Item& item : items()) {
-        if (item.key() == keyData)
-            return itemsToEntry(item);
-    }
-    return Entry();
-}
-
-HeapVector<FormDataList::Entry> FormDataList::getAll(const String& key) const
-{
-    HeapVector<FormDataList::Entry> matches;
-
-    const CString keyData = encodeAndNormalize(key);
-    for (const Item& item : items()) {
-        if (item.key() == keyData)
-            matches.append(itemsToEntry(item));
-    }
-
-    return matches;
-}
-
-FormDataList::Entry FormDataList::itemsToEntry(const FormDataList::Item& item) const
-{
-    const CString nameData = item.key();
-    const String name = m_encoding.decode(nameData.data(), nameData.length());
-
-    if (!item.blob()) {
-        const CString valueData = item.data();
-        return Entry(name, m_encoding.decode(valueData.data(), valueData.length()));
-    }
-    return Entry(name, item.file());
-}
-
 File* FormDataList::Item::file() const
 {
     ASSERT(blob());
@@ -194,12 +159,6 @@ DEFINE_TRACE(FormDataList)
     visitor->trace(m_items);
 }
 
-
-DEFINE_TRACE(FormDataList::Entry)
-{
-    visitor->trace(m_file);
-}
-
 DEFINE_TRACE(FormDataList::Item)
 {
     visitor->trace(m_blob);

third_party/WebKit/Source/core/html/FormDataList.h

@@ -35,33 +35,6 @@ namespace blink {
 // TODO(tkent): Merge FormDataList into DOMFormData.
 class CORE_EXPORT FormDataList : public GarbageCollected<FormDataList> {
 public:
-    // TODO(tkent): Merge Entry and Item.
-    class Entry final {
-        ALLOW_ONLY_INLINE_ALLOCATION();
-    public:
-        enum Type { None, StringType, FileType };
-
-        Entry() : m_type(None) { }
-        Entry(const String& name, const String& value) : m_type(StringType), m_name(name), m_string(value) { }
-        Entry(const String& name, File* value) : m_type(FileType), m_name(name), m_file(value) { }
-
-        bool isNone() const { return m_type == None; }
-        bool isString() const { return m_type == StringType; }
-        bool isFile() const { return m_type == FileType; }
-
-        const String& name() const { ASSERT(m_type != None); return m_name; }
-        const String& string() const { ASSERT(m_type == StringType); return m_string; }
-        File* file() const { ASSERT(m_type == FileType); return m_file; }
-
-        DECLARE_TRACE();
-
-    private:
-        const Type m_type;
-        const String m_name;
-        const String m_string;
-        const Member<File> m_file;
-    };
-
     class Item {
         ALLOW_ONLY_INLINE_ALLOCATION();
     public:
@@ -105,8 +78,6 @@ public:
         appendItem(Item(encodeAndNormalize(key), blob, filename));
     }
 
-    Entry getEntry(const String& key) const;
-    HeapVector<Entry> getAll(const String& key) const;
     size_t size() const { return m_items.size(); }
 
     const FormDataListItems& items() const { return m_items; }
@@ -127,14 +98,12 @@ private:
     void appendKeyValuePairItemsTo(EncodedFormData*, const WTF::TextEncoding&, bool isMultiPartForm, EncodedFormData::EncodingType = EncodedFormData::FormURLEncoded);
 
     void appendItem(const Item&);
-    Entry itemsToEntry(const Item&) const;
 
     WTF::TextEncoding m_encoding;
 };
 
 } // namespace blink
 
-WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::FormDataList::Entry);
 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::FormDataList::Item);
 
 #endif // FormDataList_h