Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95589 => 95590)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-21 01:04:43 UTC (rev 95589)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-21 01:07:43 UTC (rev 95590)
@@ -1,3 +1,14 @@
+2011-09-20 Jay Civelli <[email protected]>
+
+ This CL makes it possible to create a blob from Chromium.
+ https://bugs.webkit.org/show_bug.cgi?id=68286
+
+ Reviewed by Darin Fisher.
+
+ * WebKit.gyp:
+ * public/WebBlob.h: Added.
+ * src/WebBlob.cpp: Added.
+
2011-09-20 Jochen Eisinger <[email protected]>
[chromium] remove obsolete WebPermissionClient::allowImages method
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (95589 => 95590)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-09-21 01:04:43 UTC (rev 95589)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-09-21 01:07:43 UTC (rev 95590)
@@ -115,6 +115,7 @@
'public/WebAudioDevice.h',
'public/WebAutofillClient.h',
'public/WebBindings.h',
+ 'public/WebBlob.h',
'public/WebBlobData.h',
'public/WebBlobRegistry.h',
'public/WebCache.h',
@@ -438,6 +439,7 @@
'src/WebAttribute.cpp',
'src/WebAudioBus.cpp',
'src/WebBindings.cpp',
+ 'src/WebBlob.cpp',
'src/WebBlobData.cpp',
'src/WebCache.cpp',
'src/WebColor.cpp',
Added: trunk/Source/WebKit/chromium/public/WebBlob.h (0 => 95590)
--- trunk/Source/WebKit/chromium/public/WebBlob.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebBlob.h 2011-09-21 01:07:43 UTC (rev 95590)
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2011 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 WebBlob_h
+#define WebBlob_h
+
+#include "WebCommon.h"
+#include "WebPrivatePtr.h"
+#include "WebString.h"
+
+#if WEBKIT_USING_V8
+namespace v8 {
+class Value;
+template <class T> class Handle;
+}
+#endif
+
+namespace WebCore { class Blob; }
+
+namespace WebKit {
+
+class WebBlob {
+public:
+ ~WebBlob() { reset(); }
+
+ WebBlob() { }
+ WebBlob(const WebBlob& b) { assign(b); }
+ WebBlob& operator=(const WebBlob& b)
+ {
+ assign(b);
+ return *this;
+ }
+
+ static WebBlob createFromFile(const WebString& path, long long size);
+
+ WEBKIT_EXPORT void reset();
+ WEBKIT_EXPORT void assign(const WebBlob&);
+
+ bool isNull() const { return m_private.isNull(); }
+
+#if WEBKIT_USING_V8
+ v8::Handle<v8::Value> toV8Value();
+#endif
+
+#if WEBKIT_IMPLEMENTATION
+ WebBlob(const WTF::PassRefPtr<WebCore::Blob>&);
+ WebBlob& operator=(const WTF::PassRefPtr<WebCore::Blob>&);
+ operator WTF::PassRefPtr<WebCore::Blob>() const;
+#endif
+
+protected:
+ WebPrivatePtr<WebCore::Blob> m_private;
+};
+
+} // namespace WebKit
+
+#endif // WebBlob_h
Added: trunk/Source/WebKit/chromium/src/WebBlob.cpp (0 => 95590)
--- trunk/Source/WebKit/chromium/src/WebBlob.cpp (rev 0)
+++ trunk/Source/WebKit/chromium/src/WebBlob.cpp 2011-09-21 01:07:43 UTC (rev 95590)
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+#include "config.h"
+#include "WebBlob.h"
+
+#include "Blob.h"
+#include "BlobData.h"
+#include "V8Blob.h"
+#include <wtf/PassOwnPtr.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+WebBlob WebBlob::createFromFile(const WebString& path, long long size)
+{
+ OwnPtr<BlobData> blobData = BlobData::create();
+ blobData->appendFile(path);
+ RefPtr<Blob> blob = Blob::create(blobData.release(), size);
+ return WebBlob(blob);
+}
+
+void WebBlob::reset()
+{
+ m_private.reset();
+}
+
+void WebBlob::assign(const WebBlob& other)
+{
+ m_private = other.m_private;
+}
+
+#if WEBKIT_USING_V8
+v8::Handle<v8::Value> WebBlob::toV8Value()
+{
+ return V8Blob::wrap(m_private.get());
+}
+#endif
+
+WebBlob::WebBlob(const WTF::PassRefPtr<WebCore::Blob>& blob)
+ : m_private(blob)
+{
+}
+
+WebBlob& WebBlob::operator=(const WTF::PassRefPtr<WebCore::Blob>& blob)
+{
+ m_private = blob;
+ return *this;
+}
+
+WebBlob::operator WTF::PassRefPtr<WebCore::Blob>() const
+{
+ return m_private.get();
+}
+
+} // namespace WebKit
