Rename FormData/FormDataBuilder to EncodedFormData/FormDataEncoder respectively.

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
  * 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.
  *
  */
 
 #include "config.h"
 #include "core/html/FormDataList.h"
 
 #include "core/fileapi/File.h"
-#include "platform/network/FormDataBuilder.h"
+#include "platform/network/FormDataEncoder.h"
 #include "platform/text/LineEnding.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
 FormDataList::FormDataList(const WTF::TextEncoding& c)
     : m_encoding(c)
 {
 }
 
@@ skipping 78 matching lines @@
 bool FormDataList::hasEntry(const String& key) const
 {
     const CString keyData = encodeAndNormalize(key);
     for (const Item& item : items()) {
         if (item.key() == keyData)
             return true;
     }
     return false;
 }
 
-PassRefPtr<FormData> FormDataList::createFormData(FormData::EncodingType encodingType)
+PassRefPtr<EncodedFormData> FormDataList::createFormData(EncodedFormData::EncodingType encodingType)
 {
-    RefPtr<FormData> result = FormData::create();
+    RefPtr<EncodedFormData> result = EncodedFormData::create();
     appendKeyValuePairItemsTo(result.get(), m_encoding, false, encodingType);
     return result.release();
 }
 
-PassRefPtr<FormData> FormDataList::createMultiPartFormData()
+PassRefPtr<EncodedFormData> FormDataList::createMultiPartFormData()
 {
-    RefPtr<FormData> result = FormData::create();
+    RefPtr<EncodedFormData> result = EncodedFormData::create();
     appendKeyValuePairItemsTo(result.get(), m_encoding, true);
     return result.release();
 }
 
-void FormDataList::appendKeyValuePairItemsTo(FormData* formData, const WTF::TextEncoding& encoding, bool isMultiPartForm, FormData::EncodingType encodingType)
+void FormDataList::appendKeyValuePairItemsTo(EncodedFormData* formData, const WTF::TextEncoding& encoding, bool isMultiPartForm, EncodedFormData::EncodingType encodingType)
 {
     if (isMultiPartForm)
-        formData->setBoundary(FormDataBuilder::generateUniqueBoundaryString());
+        formData->setBoundary(FormDataEncoder::generateUniqueBoundaryString());
 
     Vector<char> encodedData;
 
     for (const Item& item : items()) {
         if (isMultiPartForm) {
             Vector<char> header;
-            FormDataBuilder::beginMultiPartHeader(header, formData->boundary().data(), item.key());
+            FormDataEncoder::beginMultiPartHeader(header, formData->boundary().data(), item.key());
 
             // If the current type is blob, then we also need to include the filename
             if (item.blob()) {
                 String name;
                 if (item.blob()->isFile()) {
                     File* file = toFile(item.blob());
                     // For file blob, use the filename (or relative path if it is present) as the name.
                     name = file->webkitRelativePath().isEmpty() ? file->name() : file->webkitRelativePath();
 
                     // If a filename is passed in FormData.append(), use it instead of the file blob's name.

[yhirano, 2015/09/09 02:14:21]

Please update the comment.

[tkent, 2015/09/09 02:22:18]

This |FormData| means the IDL interface |FormData|.  So, the comment is not
incorrect.  I'll change it to DOMFormData.

[yhirano, 2015/09/09 02:25:51]

I see, thanks.

                     if (!item.filename().isNull())
                         name = item.filename();
                 } else {
                     // For non-file blob, use the filename if it is passed in FormData.append().

[yhirano, 2015/09/09 02:14:21]

ditto

[tkent, 2015/09/09 02:22:18]

Ditto.

                     if (!item.filename().isNull())
                         name = item.filename();
                     else
                         name = "blob";
                 }
 
                 // We have to include the filename=".." part in the header, even if the filename is empty
-                FormDataBuilder::addFilenameToMultiPartHeader(header, encoding, name);
+                FormDataEncoder::addFilenameToMultiPartHeader(header, encoding, name);
 
                 // Add the content type if available, or "application/octet-stream" otherwise (RFC 1867).
                 String contentType;
                 if (item.blob()->type().isEmpty())
                     contentType = "application/octet-stream";
                 else
                     contentType = item.blob()->type();
-                FormDataBuilder::addContentTypeToMultiPartHeader(header, contentType.latin1());
+                FormDataEncoder::addContentTypeToMultiPartHeader(header, contentType.latin1());
             }
 
-            FormDataBuilder::finishMultiPartHeader(header);
+            FormDataEncoder::finishMultiPartHeader(header);
 
             // Append body
             formData->appendData(header.data(), header.size());
             if (item.blob()) {
                 if (item.blob()->hasBackingFile()) {
                     File* file = toFile(item.blob());
                     // Do not add the file if the path is empty.
                     if (!file->path().isEmpty())
                         formData->appendFile(file->path());
                     if (!file->fileSystemURL().isEmpty())
                         formData->appendFileSystemURL(file->fileSystemURL());
                 } else {
                     formData->appendBlob(item.blob()->uuid(), item.blob()->blobDataHandle());
                 }
             } else {
                 formData->appendData(item.data().data(), item.data().length());
             }
             formData->appendData("\r\n", 2);
         } else {
-            FormDataBuilder::addKeyValuePairAsFormData(encodedData, item.key(), item.data(), encodingType);
+            FormDataEncoder::addKeyValuePairAsFormData(encodedData, item.key(), item.data(), encodingType);
         }
     }
 
     if (isMultiPartForm)
-        FormDataBuilder::addBoundaryToMultiPartHeader(encodedData, formData->boundary().data(), true);
+        FormDataEncoder::addBoundaryToMultiPartHeader(encodedData, formData->boundary().data(), true);
 
     formData->appendData(encodedData.data(), encodedData.size());
 }
 
 CString FormDataList::encodeAndNormalize(const String& string) const
 {
     CString encodedString = m_encoding.encode(string, WTF::EntitiesForUnencodables);
     return normalizeLineEndingsToCRLF(encodedString);
 }
 
 DEFINE_TRACE(FormDataList)
 {
     visitor->trace(m_items);
 }
 
 
 DEFINE_TRACE(FormDataList::Entry)
 {
     visitor->trace(m_file);
 }
 
 DEFINE_TRACE(FormDataList::Item)
 {
     visitor->trace(m_blob);
 }
 
 } // namespace blink