Sharing of SharedArrayBuffer via PostMessage transfer

Source/bindings/core/v8/SerializedScriptValue.cpp

Index: Source/bindings/core/v8/SerializedScriptValue.cpp
diff --git a/Source/bindings/core/v8/SerializedScriptValue.cpp b/Source/bindings/core/v8/SerializedScriptValue.cpp
index 8a38d221e105ad3bfd736b79f4f38b5d44e05fd6..373998e1b4f66486aa4c6a15f7c5dcd814ce6354 100644
--- a/Source/bindings/core/v8/SerializedScriptValue.cpp
+++ b/Source/bindings/core/v8/SerializedScriptValue.cpp
@@ -39,6 +39,7 @@
 #include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "bindings/core/v8/V8ArrayBuffer.h"
 #include "bindings/core/v8/V8MessagePort.h"
+#include "bindings/core/v8/V8SharedArrayBuffer.h"
 #include "core/dom/ExceptionCode.h"
 #include "platform/SharedBuffer.h"
 #include "platform/blob/BlobData.h"
@@ -100,9 +101,10 @@ static void acculumateArrayBuffersForAllWorlds(v8::Isolate* isolate, DOMArrayBuf
     }
 }
 
-PassOwnPtr<SerializedScriptValue::ArrayBufferContentsArray> SerializedScriptValue::createArrayBuffers(v8::Isolate* isolate, ArrayBufferArray& arrayBuffers, ExceptionState& exceptionState)
+PassOwnPtr<SerializedScriptValue::ArrayBufferContentsArray> SerializedScriptValue::createArrayBuffers(v8::Isolate* isolate, ArrayBufferArray& arrayBuffers, SharedArrayBufferArray& sharedArrayBuffers, ExceptionState& exceptionState)
 {
-    ASSERT(arrayBuffers.size());
+    size_t bufferCount = arrayBuffers.size() + sharedArrayBuffers.size();
+    ASSERT(bufferCount > 0);
 
     for (size_t i = 0; i < arrayBuffers.size(); i++) {
         if (arrayBuffers[i]->isNeutered()) {
@@ -111,7 +113,7 @@ PassOwnPtr<SerializedScriptValue::ArrayBufferContentsArray> SerializedScriptValu
         }
     }
 
-    OwnPtr<ArrayBufferContentsArray> contents = adoptPtr(new ArrayBufferContentsArray(arrayBuffers.size()));
+    OwnPtr<ArrayBufferContentsArray> contents = adoptPtr(new ArrayBufferContentsArray(bufferCount));
 
     HashSet<DOMArrayBuffer*> visited;
     for (size_t i = 0; i < arrayBuffers.size(); i++) {
@@ -139,6 +141,21 @@ PassOwnPtr<SerializedScriptValue::ArrayBufferContentsArray> SerializedScriptValu
             for (size_t j = 0; j < bufferHandles.size(); j++)
                 bufferHandles[j]->Neuter();
     }
+
+    HashSet<DOMSharedArrayBuffer*> sharedVisited;
+    size_t offset = arrayBuffers.size();
+    for (size_t i = 0; i < sharedArrayBuffers.size(); i++) {
+        if (sharedVisited.contains(sharedArrayBuffers[i].get()))
+            continue;
+        sharedVisited.add(sharedArrayBuffers[i].get());
+
+        bool result = sharedArrayBuffers[i]->transfer(contents->at(i + offset));
+        if (!result) {
+            exceptionState.throwDOMException(DataCloneError, "SharedArrayBuffer at index " + String::number(i) + " could not be transferred.");
+            return nullptr;
+        }
+    }
+
     return contents.release();
 }
 
@@ -158,11 +175,12 @@ v8::Local<v8::Value> SerializedScriptValue::deserialize(v8::Isolate* isolate, Me
     return SerializedScriptValueFactory::instance().deserialize(this, isolate, messagePorts, blobInfo);
 }
 
-bool SerializedScriptValue::extractTransferables(v8::Isolate* isolate, v8::Local<v8::Value> value, int argumentIndex, MessagePortArray& ports, ArrayBufferArray& arrayBuffers, ExceptionState& exceptionState)
+bool SerializedScriptValue::extractTransferables(v8::Isolate* isolate, v8::Local<v8::Value> value, int argumentIndex, MessagePortArray& ports, ArrayBufferArray& arrayBuffers, SharedArrayBufferArray& sharedArrayBuffers, ExceptionState& exceptionState)
 {
     if (isUndefinedOrNull(value)) {
         ports.resize(0);
         arrayBuffers.resize(0);
+        sharedArrayBuffers.resize(0);
         return true;
     }
 
@@ -204,6 +222,13 @@ bool SerializedScriptValue::extractTransferables(v8::Isolate* isolate, v8::Local
                 return false;
             }
             arrayBuffers.append(arrayBuffer.release());
+        } else if (V8SharedArrayBuffer::hasInstance(transferrable, isolate)) {
+            RefPtr<DOMSharedArrayBuffer> sharedArrayBuffer = V8SharedArrayBuffer::toImpl(v8::Handle<v8::Object>::Cast(transferrable));
+            if (sharedArrayBuffers.contains(sharedArrayBuffer)) {
+                exceptionState.throwDOMException(DataCloneError, "SharedArrayBuffer at index " + String::number(i) + " is a duplicate of an earlier SharedArrayBuffer.");
+                return false;
+            }
+            sharedArrayBuffers.append(sharedArrayBuffer.release());
         } else {
             exceptionState.throwTypeError("Value at index " + String::number(i) + " does not have a transferable type.");
             return false;
@@ -231,9 +256,9 @@ SerializedScriptValue::~SerializedScriptValue()
     }
 }
 
-void SerializedScriptValue::transferArrayBuffers(v8::Isolate* isolate, ArrayBufferArray& arrayBuffers, ExceptionState& exceptionState)
+void SerializedScriptValue::transferArrayBuffers(v8::Isolate* isolate, ArrayBufferArray& arrayBuffers, SharedArrayBufferArray& sharedArrayBuffers, ExceptionState& exceptionState)
 {
-    m_arrayBufferContentsArray = createArrayBuffers(isolate, arrayBuffers, exceptionState);
+    m_arrayBufferContentsArray = createArrayBuffers(isolate, arrayBuffers, sharedArrayBuffers, exceptionState);
 }
 
 } // namespace blink