blob hacking webcore style

public/platform/WebBlobData.h

 /*
  * Copyright (C) 2010 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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebBlobData_h
 #define WebBlobData_h
 
 #include "WebString.h"
 #include "WebThreadSafeData.h"
 #include "WebURL.h"
 
+#define USE_BLOB_UUIDS
+
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class BlobData; }
 namespace WTF { template <typename T> class PassOwnPtr; }
 #endif
 
 namespace WebKit {
 
 class WebBlobDataPrivate;
 
 class WebBlobData {
 public:
     struct Item {
-        // TypeURL is DEPRECATED
-        enum { TypeData, TypeFile, TypeBlob, TypeFileSystemURL, TypeURL = TypeFileSystemURL } type;
+        enum { TypeData, TypeFile, TypeBlob, TypeFileSystemURL } type;
         WebThreadSafeData data;
+        WebString blobUUID;
         WebString filePath;
         WebURL fileSystemURL;
         long long offset;
         long long length; // -1 means go to the end of the file/blob.
         double expectedModificationTime; // 0.0 means that the time is not set.
-
-        // DEPRECATED, use fileSystemURL
-        WebURL url;
-
-        // FIXME: deprecate url and use uuid
-        WebURL blobURL;
-        WebString blobUUID;
     };
 
     ~WebBlobData() { reset(); }
 
     WebBlobData() : m_private(0) { }
 
     BLINK_EXPORT void initialize();
     BLINK_EXPORT void reset();
 
     bool isNull() const { return !m_private; }
@@ skipping 18 matching lines @@
 private:
 #if BLINK_IMPLEMENTATION
     void assign(const WTF::PassOwnPtr<WebCore::BlobData>&);
 #endif
     WebBlobDataPrivate* m_private;
 };
 
 } // namespace WebKit
 
 #endif // WebBlobData_h