Fold FormDataList::getEntry(index) into DOMFormData.

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 33 matching lines @@
 
 class DOMFormDataIterationSource final : public PairIterable<String, FormDataEntryValue>::IterationSource {
 public:
     DOMFormDataIterationSource(DOMFormData* formData) : m_formData(formData), m_current(0) { }
 
     bool next(ScriptState* scriptState, String& key, FormDataEntryValue& value, ExceptionState& exceptionState) override
     {
         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())
+        const FormDataList::Item& entry = m_formData->items()[m_current++];
+        key = m_formData->decode(entry.key());
+        if (entry.isString()) {
+            value.setUSVString(m_formData->decode(entry.data()));
+        } else {
+            ASSERT(entry.isFile());
             value.setFile(entry.file());
-        else
-            ASSERT_NOT_REACHED();
+        }
         return true;
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_formData);
         PairIterable<String, FormDataEntryValue>::IterationSource::trace(visitor);
     }
 
 private:
@@ skipping 133 matching lines @@
             found = true;
             m_items[i] = item;
             ++i;
         }
     }
     if (!found)
         m_items.append(item);
     return;
 }
 
+String DOMFormData::decode(const CString& data) const
+{
+    return encoding().decode(data.data(), data.length());
+}
+
 PairIterable<String, FormDataEntryValue>::IterationSource* DOMFormData::startIteration(ScriptState*, ExceptionState&)
 {
     if (m_opaque)
         return new DOMFormDataIterationSource(new DOMFormData(nullptr));
 
     return new DOMFormDataIterationSource(this);
 }
 
 } // namespace blink