blob hacking webcore style

public/platform/WebHTTPBody.h

 /*
  * 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebHTTPBody_h
 #define WebHTTPBody_h
 
+#include "WebBlobData.h"
 #include "WebData.h"
 #include "WebNonCopyable.h"
 #include "WebString.h"
 #include "WebURL.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class FormData; }
 namespace WTF { template <typename T> class PassRefPtr; }
 #endif
 
 namespace WebKit {
 
 class WebHTTPBodyPrivate;
 
 class WebHTTPBody {
 public:
     struct Element {
         enum Type { TypeData, TypeFile, TypeBlob, TypeFileSystemURL } type;
         WebData data;
         WebString filePath;
         long long fileStart;
         long long fileLength; // -1 means to the end of the file.
         double modificationTime;
         WebURL fileSystemURL;
-
-        // DEPRECATED, use fileSystemURL
-        WebURL url;
-
-        // FIXME: deprecate url and use uuid
-        WebURL blobURL;
         WebString blobUUID;
     };
 
     ~WebHTTPBody() { reset(); }
 
     WebHTTPBody() : m_private(0) { }
     WebHTTPBody(const WebHTTPBody& b) : m_private(0) { assign(b); }
     WebHTTPBody& operator=(const WebHTTPBody& b)
     {
         assign(b);
@@ skipping 11 matching lines @@
 
     // Sets the values of the element at the given index. Returns false if
     // index is out of bounds.
     BLINK_EXPORT bool elementAt(size_t index, Element&) const;
 
     // Append to the list of elements.
     BLINK_EXPORT void appendData(const WebData&);
     BLINK_EXPORT void appendFile(const WebString&);
     // Passing -1 to fileLength means to the end of the file.
     BLINK_EXPORT void appendFileRange(const WebString&, long long fileStart, long long fileLength, double modificationTime);
-    BLINK_EXPORT void appendBlob(const WebURL&); // FIXME: deprecate this
+    BLINK_EXPORT void appendBlob(const WebString& uuid);
 
     // Append a resource which is identified by the FileSystem URL.
     BLINK_EXPORT void appendFileSystemURLRange(const WebURL&, long long start, long long length, double modificationTime);
-    BLINK_EXPORT void appendURLRange(const WebURL&, long long start, long long length, double modificationTime); // DEPRECATED
 
     // Identifies a particular form submission instance. A value of 0 is
     // used to indicate an unspecified identifier.
     BLINK_EXPORT long long identifier() const;
     BLINK_EXPORT void setIdentifier(long long);
 
     BLINK_EXPORT bool containsPasswordData() const;
     BLINK_EXPORT void setContainsPasswordData(bool);
 
 #if BLINK_IMPLEMENTATION
     WebHTTPBody(const WTF::PassRefPtr<WebCore::FormData>&);
     WebHTTPBody& operator=(const WTF::PassRefPtr<WebCore::FormData>&);
     operator WTF::PassRefPtr<WebCore::FormData>() const;
 #endif
 
 private:
     void assign(WebHTTPBodyPrivate*);
     void ensureMutable();
     WebHTTPBodyPrivate* m_private;
 };
 
 } // namespace WebKit
 
 #endif