Make OffscreenCanvas Transferable

third_party/WebKit/Source/bindings/modules/v8/SerializedScriptValueForModulesFactory.cpp

Index: third_party/WebKit/Source/bindings/modules/v8/SerializedScriptValueForModulesFactory.cpp
diff --git a/third_party/WebKit/Source/bindings/modules/v8/SerializedScriptValueForModulesFactory.cpp b/third_party/WebKit/Source/bindings/modules/v8/SerializedScriptValueForModulesFactory.cpp
index bafa2c93bb6ca9d27d78816fd336e5b080bb6385..2d1931c537c1624f86a7118300e4de116c58462e 100644
--- a/third_party/WebKit/Source/bindings/modules/v8/SerializedScriptValueForModulesFactory.cpp
+++ b/third_party/WebKit/Source/bindings/modules/v8/SerializedScriptValueForModulesFactory.cpp
@@ -7,6 +7,7 @@
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/SerializedScriptValue.h"
 #include "bindings/modules/v8/ScriptValueSerializerForModules.h"
+#include "bindings/modules/v8/TransferableOffscreenCanvas.h"
 #include "core/dom/ExceptionCode.h"
 
 namespace blink {
@@ -50,6 +51,33 @@ PassRefPtr<SerializedScriptValue> SerializedScriptValueForModulesFactory::create
     return createFromWire(wireData);
 }
 
+void SerializedScriptValueForModulesFactory::transferData(SerializedScriptValue* serializedValue, SerializedScriptValueWriter& writer, Transferables* transferables, ExceptionState& exceptionState, v8::Isolate* isolate)
+{
+    serializedValue->setData(writer.takeWireString());
+    ASSERT(serializedValue->data().impl()->hasOneRef());
+    const auto& offscreenCanvases = static_cast<TransferableOffscreenCanvas*>(transferables)->offscreenCanvases;
+    if (offscreenCanvases.size()) {
+        for (size_t i = 0; i < offscreenCanvases.size(); i++) {
+            if (offscreenCanvases[i]->isNeutered()) {
+                exceptionState.throwDOMException(DataCloneError, "OffscreenCanvas at index " + String::number(i) + " is already neutered.");
+                return;
+            }
+            if (offscreenCanvases[i]->renderingContext()) {
+                exceptionState.throwDOMException(DataCloneError, "OffscreenCanvas at index " + String::number(i) + " has an associated context.");
+                return;
+            }
+        }
+        HeapHashSet<Member<OffscreenCanvas>> visited;
+        for (size_t i = 0; i < offscreenCanvases.size(); i++) {

[haraken, 2016/04/19 00:48:10]

Can we avoid iterating over offscreenCanvases twice?

[xidachen, 2016/04/19 15:29:50]

Done.

+            if (visited.contains(offscreenCanvases[i].get()))
+                continue;
+            visited.add(offscreenCanvases[i].get());
+            offscreenCanvases[i].get()->setNeutered();
+        }
+    }
+    SerializedScriptValueFactory::transferData(serializedValue, writer, transferables, exceptionState, isolate);
+}
+
 ScriptValueSerializer::Status SerializedScriptValueForModulesFactory::doSerialize(v8::Local<v8::Value> value, SerializedScriptValueWriter& writer, Transferables* transferables, WebBlobInfoArray* blobInfo, BlobDataHandleMap& blobDataHandles, v8::TryCatch& tryCatch, String& errorMessage, v8::Isolate* isolate)
 {
     ScriptValueSerializerForModules serializer(writer, transferables, blobInfo, blobDataHandles, tryCatch, ScriptState::current(isolate));