blob hacking webcore style

Source/core/platform/chromium/support/WebHTTPBody.cpp

 /*
  * Copyright (C) 2009 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 61 matching lines @@
     if (index >= m_private->elements().size())
         return false;
 
     const FormDataElement& element = m_private->elements()[index];
 
     result.data.reset();
     result.filePath.reset();
     result.fileStart = 0;
     result.fileLength = 0;
     result.modificationTime = invalidFileTime();
-    result.url = KURL();
-    result.blobURL = KURL();
     result.blobUUID.reset();
 
     switch (element.m_type) {
     case FormDataElement::data:
         result.type = Element::TypeData;
         result.data.assign(element.m_data.data(), element.m_data.size());
         break;
     case FormDataElement::encodedFile:
         result.type = Element::TypeFile;
         result.filePath = element.m_filename;
         result.fileStart = element.m_fileStart;
         result.fileLength = element.m_fileLength;
         result.modificationTime = element.m_expectedFileModificationTime;
         break;
     case FormDataElement::encodedBlob:
         result.type = Element::TypeBlob;
-        result.url = element.m_url; // DEPRECATED, should be able to remove after https://codereview.chromium.org/23223003/ lands
-        result.blobURL = element.m_url; // FIXME: deprecate this.
+        result.blobUUID = element.m_blobUUID;
         break;
-    case FormDataElement::encodedURL:
+    case FormDataElement::encodedFileSystemURL:
         result.type = Element::TypeFileSystemURL;
-        result.url = element.m_url; // DEPRECATED
-        result.fileSystemURL = element.m_url;
+        result.fileSystemURL = element.m_fileSystemURL;
         result.fileStart = element.m_fileStart;
         result.fileLength = element.m_fileLength;
         result.modificationTime = element.m_expectedFileModificationTime;
         break;
     default:
         ASSERT_NOT_REACHED();
         return false;
     }
 
     return true;
@@ skipping 17 matching lines @@
 {
     ensureMutable();
     m_private->appendFileRange(filePath, fileStart, fileLength, modificationTime);
 }
 
 void WebHTTPBody::appendFileSystemURLRange(const WebURL& url, long long start, long long length, double modificationTime)
 {
     // Currently we only support filesystem URL.
     ASSERT(KURL(url).protocolIs("filesystem"));
     ensureMutable();
-    m_private->appendURLRange(url, start, length, modificationTime);
+    m_private->appendFileSystemURLRange(url, start, length, modificationTime);
 }
 
-void WebHTTPBody::appendURLRange(const WebURL& url, long long start, long long length, double modificationTime)
+void WebHTTPBody::appendBlob(const WebString& uuid)
 {
-    appendFileSystemURLRange(url, start, length, modificationTime);
-}
-
-void WebHTTPBody::appendBlob(const WebURL& blobURL)
-{
-    ASSERT(KURL(blobURL).protocolIs("blob"));
     ensureMutable();
-    m_private->appendBlob(blobURL);
+    m_private->appendBlob(uuid, 0);
 }
 
 long long WebHTTPBody::identifier() const
 {
     ASSERT(!isNull());
     return m_private->identifier();
 }
 
 void WebHTTPBody::setIdentifier(long long identifier)
 {
@@ skipping 36 matching lines @@
 }
 
 void WebHTTPBody::ensureMutable()
 {
     ASSERT(!isNull());
     if (!m_private->hasOneRef())
         assign(static_cast<WebHTTPBodyPrivate*>(m_private->copy().leakRef()));
 }
 
 } // namespace WebKit