Make OffscreenCanvas Transferable

third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp

 /*
  * Copyright (C) 2010 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
@@ skipping 19 matching lines @@
 
 #include "bindings/core/v8/SerializedScriptValue.h"
 
 #include "bindings/core/v8/DOMDataStore.h"
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/ScriptValueSerializer.h"
 #include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "bindings/core/v8/Transferables.h"
-#include "bindings/core/v8/V8ArrayBuffer.h"
-#include "bindings/core/v8/V8ImageBitmap.h"
-#include "bindings/core/v8/V8MessagePort.h"
-#include "bindings/core/v8/V8SharedArrayBuffer.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMSharedArrayBuffer.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/MessagePort.h"
 #include "core/frame/ImageBitmap.h"
 #include "platform/SharedBuffer.h"
 #include "platform/blob/BlobData.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Assertions.h"
 #include "wtf/ByteOrder.h"
@@ skipping 175 matching lines @@
     // Validate the passed array of transferables.
     for (unsigned i = 0; i < length; ++i) {
         v8::Local<v8::Value> transferableObject;
         if (!transferableArray->Get(isolate->GetCurrentContext(), i).ToLocal(&transferableObject))
             return false;
         // Validation of non-null objects, per HTML5 spec 10.3.3.
         if (isUndefinedOrNull(transferableObject)) {
             exceptionState.throwTypeError("Value at index " + String::number(i) + " is an untransferable " + (transferableObject->IsUndefined() ? "'undefined'" : "'null'") + " value.");
             return false;
         }
-        // Validation of Objects implementing an interface, per WebIDL spec 4.1.15.
-        if (V8MessagePort::hasInstance(transferableObject, isolate)) {
-            MessagePort* port = V8MessagePort::toImpl(v8::Local<v8::Object>::Cast(transferableObject));
-            // Check for duplicate MessagePorts.
-            if (transferables.messagePorts.contains(port)) {
-                exceptionState.throwDOMException(DataCloneError, "Message port at index " + String::number(i) + " is a duplicate of an earlier port.");
-                return false;
-            }
-            transferables.messagePorts.append(port);
-        } else if (V8ArrayBuffer::hasInstance(transferableObject, isolate)) {
-            DOMArrayBuffer* arrayBuffer = V8ArrayBuffer::toImpl(v8::Local<v8::Object>::Cast(transferableObject));
-            if (transferables.arrayBuffers.contains(arrayBuffer)) {
-                exceptionState.throwDOMException(DataCloneError, "ArrayBuffer at index " + String::number(i) + " is a duplicate of an earlier ArrayBuffer.");
-                return false;
-            }
-            transferables.arrayBuffers.append(arrayBuffer);
-        } else if (V8SharedArrayBuffer::hasInstance(transferableObject, isolate)) {
-            DOMSharedArrayBuffer* sharedArrayBuffer = V8SharedArrayBuffer::toImpl(v8::Local<v8::Object>::Cast(transferableObject));
-            if (transferables.arrayBuffers.contains(sharedArrayBuffer)) {
-                exceptionState.throwDOMException(DataCloneError, "SharedArrayBuffer at index " + String::number(i) + " is a duplicate of an earlier SharedArrayBuffer.");
-                return false;
-            }
-            transferables.arrayBuffers.append(sharedArrayBuffer);
-        } else if (V8ImageBitmap::hasInstance(transferableObject, isolate)) {
-            ImageBitmap* imageBitmap = V8ImageBitmap::toImpl(v8::Local<v8::Object>::Cast(transferableObject));
-            if (transferables.imageBitmaps.contains(imageBitmap)) {
-                exceptionState.throwDOMException(DataCloneError, "ImageBitmap at index " + String::number(i) + " is a duplicate of an earlier ImageBitmap.");
-                return false;
-            }
-            transferables.imageBitmaps.append(imageBitmap);
-        } else {
-            exceptionState.throwTypeError("Value at index " + String::number(i) + " does not have a transferable type.");
+        if (!SerializedScriptValueFactory::instance().extractTransferables(isolate, transferables, exceptionState, transferableObject, i)) {

[xidachen, 2016/04/20 17:16:28]

Becaseu extractTransferables() is a static method so I cannot make it virtual.

I took the same approach as SerializedScriptValue::deserialize(), which calls
SerializedScriptValueFactory::instance().deserialize(). In here, I call
SerializedScriptValueFactory::instance().extractTransferables().

With that, the extractor and offscreenCanvasExtractor classes are removed.

[haraken, 2016/04/21 00:29:02]

Nice refactoring.

+            if (!exceptionState.hadException())
+                exceptionState.throwTypeError("Value at index " + String::number(i) + " does not have a transferable type.");
             return false;
         }
     }
     return true;
 }
 
 void SerializedScriptValue::registerMemoryAllocatedWithCurrentScriptContext()
 {
     if (m_externallyAllocatedMemory)
         return;
     m_externallyAllocatedMemory = static_cast<intptr_t>(m_data.length());
     v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(m_externallyAllocatedMemory);
 }
 
 bool SerializedScriptValue::containsTransferableArrayBuffer() const
 {
     return m_arrayBufferContentsArray && !m_arrayBufferContentsArray->isEmpty();
 }
 
 } // namespace blink