Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 65 insertions, 0 deletions

diff --git a/Source/WebCore/platform/network/BlobStorageData.h b/Source/WebCore/platform/network/BlobStorageData.h
new file mode 100644
index 0000000..6535e62
--- /dev/null
+++ b/Source/WebCore/platform/network/BlobStorageData.h
@@ -0,0 +1,65 @@
+/*
+ * 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
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * 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 BlobStorageData_h
+#define BlobStorageData_h
+
+#include "BlobData.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+
+class BlobStorageData : public RefCounted<BlobStorageData> {
+public:
+    static PassRefPtr<BlobStorageData> create(const String& contentType, const String& contentDisposition)
+    {
+        return adoptRef(new BlobStorageData(contentType, contentDisposition));
+    }
+
+    const String& contentType() const { return m_data.contentType(); }
+    const String& contentDisposition() const { return m_data.contentDisposition(); }    
+    const BlobDataItemList& items() const { return m_data.items(); }
+
+private:
+    friend class BlobRegistryImpl;
+
+    BlobStorageData(const String& contentType, const String& contentDisposition)
+    {
+        m_data.setContentType(contentType);
+        m_data.setContentDisposition(contentDisposition);
+    }
+
+    BlobData m_data;
+};
+
+} // namespace WebCore
+
+#endif // BlobStorageData_h