Fold FormDataList::getEntry(index) into DOMFormData.

Source/core/html/FormDataList.cpp

 /*
  * 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
@@ skipping 30 matching lines @@
 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();
 }
 
-FormDataList::Entry FormDataList::getEntry(size_t index) const
-{
-    const FormDataListItems& items = this->items();
-    if (index >= items.size())
-        return Entry();
-    return itemsToEntry(items[index]);
-}
-
 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());
     // The spec uses the passed filename when inserting entries into the list.
     // Here, we apply the filename (if present) as an override when extracting
     // items.
     // FIXME: Consider applying the name during insertion.
 
-    if (item.blob()->isFile()) {
-        File* file = toFile(item.blob());
-        if (item.filename().isNull())
-            return Entry(name, file);
-        return Entry(name, file->clone(item.filename()));
+    if (blob()->isFile()) {
+        File* file = toFile(blob());
+        if (filename().isNull())
+            return file;
+        return file->clone(filename());
     }
 
-    String filename = item.filename();
+    String filename = m_filename;
     if (filename.isNull())
         filename = "blob";
-    return Entry(name, File::create(filename, currentTimeMS(), item.blob()->blobDataHandle()));
+    return File::create(filename, currentTimeMS(), blob()->blobDataHandle());
 }
 
 PassRefPtr<FormData> FormDataList::createFormData(FormData::EncodingType encodingType)
 {
     RefPtr<FormData> result = FormData::create();
     appendKeyValuePairItemsTo(result.get(), m_encoding, false, encodingType);
     return result.release();
 }
 
 PassRefPtr<FormData> FormDataList::createMultiPartFormData()
@@ skipping 92 matching lines @@
 {
     visitor->trace(m_file);
 }
 
 DEFINE_TRACE(FormDataList::Item)
 {
     visitor->trace(m_blob);
 }
 
 } // namespace blink