Break core/platform/network dependency on core

Source/core/platform/network/FormData.cpp

 /*
  * Copyright (C) 2004, 2006, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * 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/platform/network/FormData.h"
 
-#include "core/fileapi/File.h"
 #include "core/platform/network/FormDataBuilder.h"
-#include "core/platform/network/FormDataList.h"
 #include "platform/FileMetadata.h"
 #include "platform/blob/BlobData.h"
 #include "wtf/text/TextEncoding.h"
 
 namespace WebCore {
 
 inline FormData::FormData()
     : m_identifier(0)
     , m_alwaysStream(false)
     , m_containsPasswordData(false)
@@ skipping 32 matching lines @@
     return result.release();
 }
 
 PassRefPtr<FormData> FormData::create(const Vector<char>& vector)
 {
     RefPtr<FormData> result = create();
     result->appendData(vector.data(), vector.size());
     return result.release();
 }
 
-PassRefPtr<FormData> FormData::create(const FormDataList& list, const WTF::TextEncoding& encoding, EncodingType encodingType)
-{
-    RefPtr<FormData> result = create();
-    result->appendKeyValuePairItems(list, encoding, false, encodingType);
-    return result.release();
-}
-
-PassRefPtr<FormData> FormData::createMultiPart(const FormDataList& list, const WTF::TextEncoding& encoding)
-{
-    RefPtr<FormData> result = create();
-    result->appendKeyValuePairItems(list, encoding, true);
-    return result.release();
-}
-
 PassRefPtr<FormData> FormData::copy() const
 {
     return adoptRef(new FormData(*this));
 }
 
 PassRefPtr<FormData> FormData::deepCopy() const
 {
     RefPtr<FormData> formData(create());
 
     formData->m_alwaysStream = m_alwaysStream;
@@ skipping 48 matching lines @@
 void FormData::appendFileSystemURL(const KURL& url)
 {
     m_elements.append(FormDataElement(url, 0, BlobDataItem::toEndOfFile, invalidFileTime()));
 }
 
 void FormData::appendFileSystemURLRange(const KURL& url, long long start, long long length, double expectedModificationTime)
 {
     m_elements.append(FormDataElement(url, start, length, expectedModificationTime));
 }
 
-void FormData::appendKeyValuePairItems(const FormDataList& list, const WTF::TextEncoding& encoding, bool isMultiPartForm, EncodingType encodingType)
-{
-    if (isMultiPartForm)
-        m_boundary = FormDataBuilder::generateUniqueBoundaryString();
-
-    Vector<char> encodedData;
-
-    const Vector<FormDataList::Item>& items = list.items();
-    size_t formDataListSize = items.size();
-    ASSERT(!(formDataListSize % 2));
-    for (size_t i = 0; i < formDataListSize; i += 2) {
-        const FormDataList::Item& key = items[i];
-        const FormDataList::Item& value = items[i + 1];
-        if (isMultiPartForm) {
-            Vector<char> header;
-            FormDataBuilder::beginMultiPartHeader(header, m_boundary.data(), key.data());
-
-            // If the current type is blob, then we also need to include the filename
-            if (value.blob()) {
-                String name;
-                if (value.blob()->isFile()) {
-                    File* file = toFile(value.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.
-                    if (!value.filename().isNull())
-                        name = value.filename();
-                } else {
-                    // For non-file blob, use the filename if it is passed in FormData.append().
-                    if (!value.filename().isNull())
-                        name = value.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);
-
-                // Add the content type if available, or "application/octet-stream" otherwise (RFC 1867).
-                String contentType;
-                if (value.blob()->type().isEmpty())
-                    contentType = "application/octet-stream";
-                else
-                    contentType = value.blob()->type();
-                FormDataBuilder::addContentTypeToMultiPartHeader(header, contentType.latin1());
-            }
-
-            FormDataBuilder::finishMultiPartHeader(header);
-
-            // Append body
-            appendData(header.data(), header.size());
-            if (value.blob()) {
-                if (value.blob()->isFile()) {
-                    File* file = toFile(value.blob());
-                    // Do not add the file if the path is empty.
-                    if (!file->path().isEmpty())
-                        appendFile(file->path());
-                    if (!file->fileSystemURL().isEmpty())
-                        appendFileSystemURL(file->fileSystemURL());
-                } else {
-                    appendBlob(value.blob()->uuid(), value.blob()->blobDataHandle());
-                }
-            } else
-                appendData(value.data().data(), value.data().length());
-            appendData("\r\n", 2);
-        } else {
-            // Omit the name "isindex" if it's the first form data element.
-            // FIXME: Why is this a good rule? Is this obsolete now?
-            if (encodedData.isEmpty() && key.data() == "isindex")
-                FormDataBuilder::encodeStringAsFormData(encodedData, value.data());
-            else
-                FormDataBuilder::addKeyValuePairAsFormData(encodedData, key.data(), value.data(), encodingType);
-        }
-    }
-
-    if (isMultiPartForm)
-        FormDataBuilder::addBoundaryToMultiPartHeader(encodedData, m_boundary.data(), true);
-
-    appendData(encodedData.data(), encodedData.size());
-}
-
 void FormData::flatten(Vector<char>& data) const
 {
     // Concatenate all the byte arrays, but omit any files.
     data.clear();
     size_t n = m_elements.size();
     for (size_t i = 0; i < n; ++i) {
         const FormDataElement& e = m_elements[i];
         if (e.m_type == FormDataElement::data)
             data.append(e.m_data.data(), static_cast<size_t>(e.m_data.size()));
     }
 }
 
 String FormData::flattenToString() const
 {
     Vector<char> bytes;
     flatten(bytes);
     return Latin1Encoding().decode(reinterpret_cast<const char*>(bytes.data()), bytes.size());
 }
 
 } // namespace WebCore