Changeset 208002 in webkit

Timestamp:

Oct 27, 2016 1:36:12 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

BufferSource should behave as an union
​https://bugs.webkit.org/show_bug.cgi?id=164056

Patch by Zan Dobersek <​zdobersek@igalia.com> on 2016-10-27
Reviewed by Chris Dumez.

WebIDL typedefs BufferSource as (ArrayBufferView or ArrayBuffer).
To follow that definition, IDLBufferSource is now type-aliased
to IDLUnion<IDLInterface<ArrayBufferView>, IDLInterface<ArrayBuffer>>.

Converter<IDLBufferSource> template specialization can now be
removed since the default specialization for IDLUnion will be
used.

C++ implementations still work through a BufferSource object.
That class now has an implicit constructor that consumes the
Variant object. The data() and length() methods on the class
now iterate the variant to find an existing object that can
provide a pointer to the data or the length of it.

• Modules/mediasource/SourceBuffer.cpp:

(WebCore::SourceBuffer::appendBuffer):

• bindings/generic/IDLTypes.h:
• bindings/js/BufferSource.h:

(WebCore::BufferSource::BufferSource):
(WebCore::BufferSource::data):
(WebCore::BufferSource::length):

• bindings/js/JSDOMConvert.h:

(WebCore::Converter<IDLBufferSource>::convert): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasource/SourceBuffer.cpp (modified) (1 diff)
• bindings/generic/IDLTypes.h (modified) (3 diffs)
• bindings/js/BufferSource.h (modified) (1 diff)
• bindings/js/JSDOMConvert.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-27  Zan Dobersek  <zdobersek@igalia.com>
+
+        BufferSource should behave as an union
+        https://bugs.webkit.org/show_bug.cgi?id=164056
+
+        Reviewed by Chris Dumez.
+
+        WebIDL typedefs BufferSource as (ArrayBufferView or ArrayBuffer).
+        To follow that definition, IDLBufferSource is now type-aliased
+        to IDLUnion<IDLInterface<ArrayBufferView>, IDLInterface<ArrayBuffer>>.
+
+        Converter<IDLBufferSource> template specialization can now be
+        removed since the default specialization for IDLUnion will be
+        used.
+
+        C++ implementations still work through a BufferSource object.
+        That class now has an implicit constructor that consumes the
+        Variant object. The data() and length() methods on the class
+        now iterate the variant to find an existing object that can
+        provide a pointer to the data or the length of it.
+
+        * Modules/mediasource/SourceBuffer.cpp:
+        (WebCore::SourceBuffer::appendBuffer):
+        * bindings/generic/IDLTypes.h:
+        * bindings/js/BufferSource.h:
+        (WebCore::BufferSource::BufferSource):
+        (WebCore::BufferSource::data):
+        (WebCore::BufferSource::length):
+        * bindings/js/JSDOMConvert.h:
+        (WebCore::Converter<IDLBufferSource>::convert): Deleted.
+
 2016-10-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp

@@ -235 +235 @@
 ExceptionOr<void> SourceBuffer::appendBuffer(const BufferSource& data)
 {
-    return appendBufferInternal(static_cast<const unsigned char*>(data.data), data.length);
+    return appendBufferInternal(static_cast<const unsigned char*>(data.data()), data.length());
 }
 

trunk/Source/WebCore/bindings/generic/IDLTypes.h

@@ -31 +31 @@
 
 namespace JSC {
+class ArrayBuffer;
+class ArrayBufferView;
 class JSValue;
 }
@@ -36 +38 @@
 namespace WebCore {
 
-class BufferSource;
 template <typename Value> class DOMPromise;
 
@@ -138 +139 @@
 };
 
-struct IDLBufferSource : IDLType<BufferSource> { };
+using IDLBufferSource = IDLUnion<IDLInterface<JSC::ArrayBufferView>, IDLInterface<JSC::ArrayBuffer>>;
 
 // Helper predicates

trunk/Source/WebCore/bindings/js/BufferSource.h

@@ -26 +26 @@
 #pragma once
 
+#include <runtime/ArrayBuffer.h>
+#include <runtime/ArrayBufferView.h>
+#include <wtf/RefPtr.h>
+#include <wtf/Variant.h>
+
 namespace WebCore {
 
 class BufferSource {
 public:
-    const uint8_t* data;
-    size_t length;
+    BufferSource(WTF::Variant<RefPtr<JSC::ArrayBufferView>, RefPtr<JSC::ArrayBuffer>>&& variant)
+        : m_variant(WTFMove(variant))
+    { }
+
+    const uint8_t* data() const
+    {
+        return WTF::visit([](auto& buffer) -> const uint8_t* {
+            return static_cast<const uint8_t*>(buffer->data());
+        }, m_variant);
+    }
+
+    size_t length() const
+    {
+        return WTF::visit([](auto& buffer) -> size_t {
+            return buffer->byteLength();
+        }, m_variant);
+    }
+
+private:
+    WTF::Variant<RefPtr<JSC::ArrayBufferView>, RefPtr<JSC::ArrayBuffer>> m_variant;
 };
 

trunk/Source/WebCore/bindings/js/JSDOMConvert.h

@@ -1032 +1032 @@
 
 // MARK: -
-// MARK: BufferSource type
-
-template<> struct Converter<IDLBufferSource> : DefaultConverter<IDLBufferSource> {
-    using ReturnType = BufferSource;
-
-    static ReturnType convert(JSC::ExecState& state, JSC::JSValue value)
-    {
-        JSC::VM& vm = state.vm();
-        auto scope = DECLARE_THROW_SCOPE(vm);
-
-        if (JSC::ArrayBuffer* buffer = JSC::toArrayBuffer(value))
-            return { static_cast<uint8_t*>(buffer->data()), buffer->byteLength() };
-        if (RefPtr<JSC::ArrayBufferView> bufferView = toArrayBufferView(value))
-            return { static_cast<uint8_t*>(bufferView->baseAddress()), bufferView->byteLength() };
-
-        throwTypeError(&state, scope, ASCIILiteral("Only ArrayBuffer and ArrayBufferView objects can be passed as BufferSource arguments"));
-        return { nullptr, 0 };
-    }
-};
-
-// MARK: -
 // MARK: Date type