Changeset 230828 in webkit

Timestamp:

Apr 19, 2018 4:59:50 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r227340): ArrayBuffers were not being serialized when sent via MessagePorts
​https://bugs.webkit.org/show_bug.cgi?id=184254
<rdar://problem/39140200>

Patch by Tadeu Zagallo <Tadeu Zagallo> on 2018-04-19
Reviewed by Daniel Bates.

Source/JavaScriptCore:

Expose an extra constructor of ArrayBufferContents in order to be able to decode SerializedScriptValues.

• runtime/ArrayBuffer.h:

(JSC::ArrayBufferContents::ArrayBufferContents):

Source/WebCore:

Add a new encoding method to SerializedScriptValue that includes ArrayBuffers.

Test: workers/message-port.html

• bindings/js/SerializedScriptValue.h:

(WebCore::SerializedScriptValue::encode const):
(WebCore::SerializedScriptValue::decode):

• dom/messageports/MessageWithMessagePorts.h:

(WebCore::MessageWithMessagePorts::encode const):
(WebCore::MessageWithMessagePorts::decode):

LayoutTests:

The regression test provided with the bug report verifies that the ArrayBuffer is properly
serialized - before, the whole data object would be null.
Test case provided by Yann Cabon <​ycabon@esri.com> as part of the bug report.

• workers/message-port-expected.txt: Added.
• workers/message-port.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/workers/message-port-expected.txt (added)
• LayoutTests/workers/message-port.html (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/ArrayBuffer.h (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/SerializedScriptValue.cpp (modified) (1 diff)
• Source/WebCore/bindings/js/SerializedScriptValue.h (modified) (3 diffs)
• Source/WebCore/dom/messageports/MessageWithMessagePorts.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-04-19  Tadeu Zagallo  <tzagallo@apple.com>
+
+        REGRESSION(r227340): ArrayBuffers were not being serialized when sent via MessagePorts
+        https://bugs.webkit.org/show_bug.cgi?id=184254
+        <rdar://problem/39140200>
+
+        Reviewed by Daniel Bates.
+
+        The regression test provided with the bug report verifies that the ArrayBuffer is properly
+        serialized - before, the whole data object would be null.
+        Test case provided by Yann Cabon <ycabon@esri.com> as part of the bug report.
+
+        * workers/message-port-expected.txt: Added.
+        * workers/message-port.html: Added.
+
 2018-04-19  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-04-19  Tadeu Zagallo  <tzagallo@apple.com>
+
+        REGRESSION(r227340): ArrayBuffers were not being serialized when sent via MessagePorts
+        https://bugs.webkit.org/show_bug.cgi?id=184254
+        <rdar://problem/39140200>
+
+        Reviewed by Daniel Bates.
+
+        Expose an extra constructor of ArrayBufferContents in order to be able to decode SerializedScriptValues.
+
+        * runtime/ArrayBuffer.h:
+        (JSC::ArrayBufferContents::ArrayBufferContents):
+
 2018-04-19  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ArrayBuffer.h

@@ -60 +60 @@
 public:
     JS_EXPORT_PRIVATE ArrayBufferContents();
+    JS_EXPORT_PRIVATE ArrayBufferContents(void* data, unsigned sizeInBytes, ArrayBufferDestructorFunction&&);
     
     JS_EXPORT_PRIVATE ArrayBufferContents(ArrayBufferContents&&);
@@ -74 +75 @@
     
     bool isShared() const { return m_shared; }
-
+    
 private:
-    ArrayBufferContents(void* data, unsigned sizeInBytes, ArrayBufferDestructorFunction&&);
-    
     void destroy();
     void reset();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-04-19  Tadeu Zagallo  <tzagallo@apple.com>
+
+        REGRESSION(r227340): ArrayBuffers were not being serialized when sent via MessagePorts
+        https://bugs.webkit.org/show_bug.cgi?id=184254
+        <rdar://problem/39140200>
+
+        Reviewed by Daniel Bates.
+
+        Add a new encoding method to SerializedScriptValue that includes ArrayBuffers.
+
+        Test: workers/message-port.html
+
+        * bindings/js/SerializedScriptValue.h:
+        (WebCore::SerializedScriptValue::encode const):
+        (WebCore::SerializedScriptValue::decode):
+        * dom/messageports/MessageWithMessagePorts.h:
+        (WebCore::MessageWithMessagePorts::encode const):
+        (WebCore::MessageWithMessagePorts::decode):
+
 2018-04-19  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp

@@ -3170 +3170 @@
 }
 
+SerializedScriptValue::SerializedScriptValue(Vector<uint8_t>&& buffer, std::unique_ptr<ArrayBufferContentsArray> arrayBufferContentsArray)
+    : m_data(WTFMove(buffer))
+    , m_arrayBufferContentsArray(WTFMove(arrayBufferContentsArray))
+{
+}
+
 SerializedScriptValue::SerializedScriptValue(Vector<uint8_t>&& buffer, const Vector<String>& blobURLs, std::unique_ptr<ArrayBufferContentsArray> arrayBufferContentsArray, std::unique_ptr<ArrayBufferContentsArray> sharedBufferContentsArray, Vector<std::pair<std::unique_ptr<ImageBuffer>, bool>>&& imageBuffers
 #if ENABLE(WEBASSEMBLY)

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

@@ -34 +34 @@
 #include <wtf/Forward.h>
 #include <wtf/Function.h>
+#include <wtf/Gigacage.h>
 #include <wtf/text/WTFString.h>
 
@@ -102 +103 @@
     const Vector<uint8_t>& toWireBytes() const { return m_data; }
 
+    template<class Encoder> void encode(Encoder&) const;
+    template<class Decoder> static RefPtr<SerializedScriptValue> decode(Decoder&);
+
     WEBCORE_EXPORT ~SerializedScriptValue();
 
 private:
     WEBCORE_EXPORT SerializedScriptValue(Vector<unsigned char>&&);
+    WEBCORE_EXPORT SerializedScriptValue(Vector<unsigned char>&&, std::unique_ptr<ArrayBufferContentsArray>);
     SerializedScriptValue(Vector<unsigned char>&&, const Vector<String>& blobURLs, std::unique_ptr<ArrayBufferContentsArray>, std::unique_ptr<ArrayBufferContentsArray> sharedBuffers, Vector<std::pair<std::unique_ptr<ImageBuffer>, bool>>&& imageBuffers
 #if ENABLE(WEBASSEMBLY)
@@ -122 +127 @@
 };
 
+template<class Encoder>
+void SerializedScriptValue::encode(Encoder& encoder) const
+{
+    encoder << m_data;
+
+    auto hasArray = m_arrayBufferContentsArray && m_arrayBufferContentsArray->size();
+    encoder << hasArray;
+
+    if (!hasArray)
+        return;
+
+    encoder << static_cast<uint64_t>(m_arrayBufferContentsArray->size());
+    for (const auto &arrayBufferContents : *m_arrayBufferContentsArray) {
+        encoder << arrayBufferContents.sizeInBytes();
+        encoder.encodeFixedLengthData(static_cast<const uint8_t*>(arrayBufferContents.data()), arrayBufferContents.sizeInBytes(), 1);
+    }
 }
+
+template<class Decoder>
+RefPtr<SerializedScriptValue> SerializedScriptValue::decode(Decoder& decoder)
+{
+    Vector<uint8_t> data;
+    if (!decoder.decode(data))
+        return nullptr;
+
+    bool hasArray;
+    if (!decoder.decode(hasArray))
+        return nullptr;
+
+    if (!hasArray)
+        return adoptRef(*new SerializedScriptValue(WTFMove(data)));
+
+    uint64_t arrayLength;
+    if (!decoder.decode(arrayLength))
+        return nullptr;
+    ASSERT(arrayLength);
+
+    auto arrayBufferContentsArray = std::make_unique<ArrayBufferContentsArray>();
+    while (arrayLength--) {
+        unsigned bufferSize;
+        if (!decoder.decode(bufferSize))
+            return nullptr;
+
+        auto buffer = Gigacage::tryMalloc(Gigacage::Primitive, bufferSize);
+        auto destructor = [] (void* ptr) {
+            Gigacage::free(Gigacage::Primitive, ptr);
+        };
+        if (!decoder.decodeFixedLengthData(static_cast<uint8_t*>(buffer), bufferSize, 1)) {
+            destructor(buffer);
+            return nullptr;
+        }
+        arrayBufferContentsArray->append({ buffer, bufferSize, WTFMove(destructor) });
+    }
+
+    return adoptRef(*new SerializedScriptValue(WTFMove(data), WTFMove(arrayBufferContentsArray)));
+}
+
+
+}

trunk/Source/WebCore/dom/messageports/MessageWithMessagePorts.h

@@ -49 +49 @@
 {
     ASSERT(message);
-    encoder << message->toWireBytes() << transferredPorts;
+    encoder << *message << transferredPorts;
 }
 
@@ -57 +57 @@
     MessageWithMessagePorts result;
 
-    Vector<uint8_t> wireBytes;
-    if (!decoder.decode(wireBytes))
+    result.message = SerializedScriptValue::decode(decoder);
+    if (!result.message)
         return std::nullopt;
 
@@ -64 +64 @@
         return std::nullopt;
 
-    result.message = SerializedScriptValue::createFromWireBytes(WTFMove(wireBytes));
     return result;
 }