blob hacking webcore style

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.
  *
@@ skipping 96 matching lines @@
     for (size_t i = 0; i < n; ++i) {
         const FormDataElement& e = m_elements[i];
         switch (e.m_type) {
         case FormDataElement::data:
             formData->m_elements.uncheckedAppend(FormDataElement(e.m_data));
             break;
         case FormDataElement::encodedFile:
             formData->m_elements.uncheckedAppend(FormDataElement(e.m_filename, e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime));
             break;
         case FormDataElement::encodedBlob:
-            formData->m_elements.uncheckedAppend(FormDataElement(e.m_url));
+            formData->m_elements.uncheckedAppend(FormDataElement(e.m_blobUUID, e.m_optionalBlobDataHandle));
             break;
-        case FormDataElement::encodedURL:
-            formData->m_elements.uncheckedAppend(FormDataElement(e.m_url, e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime));
+        case FormDataElement::encodedFileSystemURL:
+            formData->m_elements.uncheckedAppend(FormDataElement(e.m_fileSystemURL, e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime));
             break;
         }
     }
     return formData.release();
 }
 
 void FormData::appendData(const void* data, size_t size)
 {
     if (m_elements.isEmpty() || m_elements.last().m_type != FormDataElement::data)
         m_elements.append(FormDataElement());
     FormDataElement& e = m_elements.last();
     size_t oldSize = e.m_data.size();
     e.m_data.grow(oldSize + size);
     memcpy(e.m_data.data() + oldSize, data, size);
 }
 
 void FormData::appendFile(const String& filename)
 {
     m_elements.append(FormDataElement(filename, 0, BlobDataItem::toEndOfFile, invalidFileTime()));
 }
 
 void FormData::appendFileRange(const String& filename, long long start, long long length, double expectedModificationTime)
 {
     m_elements.append(FormDataElement(filename, start, length, expectedModificationTime));
 }
 
-void FormData::appendBlob(const KURL& blobURL)
+void FormData::appendBlob(const String& uuid, PassRefPtr<BlobDataHandle> optionalHandle)
 {
-    m_elements.append(FormDataElement(blobURL));
+    m_elements.append(FormDataElement(uuid, optionalHandle));
 }
 
-void FormData::appendURL(const KURL& url)
+void FormData::appendFileSystemURL(const KURL& url)
 {
     m_elements.append(FormDataElement(url, 0, BlobDataItem::toEndOfFile, invalidFileTime()));
 }
 
-void FormData::appendURLRange(const KURL& url, long long start, long long length, double expectedModificationTime)
+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;
@@ skipping 43 matching lines @@
 
             // 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())
-                        appendURL(file->fileSystemURL());
+                        appendFileSystemURL(file->fileSystemURL());
+                } else {
+                    appendBlob(value.blob()->uuid(), value.blob()->blobDataHandle());
                 }
-                else
-                    appendBlob(value.blob()->url());
             } 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);
@@ skipping 19 matching lines @@
 }
 
 String FormData::flattenToString() const
 {
     Vector<char> bytes;
     flatten(bytes);
     return Latin1Encoding().decode(reinterpret_cast<const char*>(bytes.data()), bytes.size());
 }
 
 } // namespace WebCore