Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp |
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp |
index e4ef25528304e0a82d0b5f20785763bf27bb3cd4..1b62e08ee0b1f7762c9dfd1045242ac027107a85 100644 |
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp |
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp |
@@ -16,7 +16,7 @@ |
#include "bindings/core/v8/ScriptValue.h" |
#include "bindings/core/v8/SerializedScriptValue.h" |
#include "bindings/core/v8/SerializedScriptValueFactory.h" |
-#include "bindings/core/v8/TransferableMessagePort.h" |
+#include "bindings/core/v8/Transferables.h" |
#include "bindings/core/v8/UnionTypesCore.h" |
#include "bindings/core/v8/V8AbstractEventListener.h" |
#include "bindings/core/v8/V8ArrayBuffer.h" |
@@ -10154,25 +10154,20 @@ void postMessageImpl(const char* interfaceName, TestObject* instance, const v8:: |
exceptionState.throwIfNeeded(); |
return; |
} |
- TransferableArray* transferables = new TransferableArray; |
+ Transferables transferables; |
if (info.Length() > 1) { |
const int transferablesArgIndex = 1; |
- if (!SerializedScriptValue::extractTransferables(info.GetIsolate(), info[transferablesArgIndex], transferablesArgIndex, *transferables, exceptionState)) { |
+ if (!SerializedScriptValue::extractTransferables(info.GetIsolate(), info[transferablesArgIndex], transferablesArgIndex, transferables, exceptionState)) { |
exceptionState.throwIfNeeded(); |
return; |
} |
} |
- RefPtr<SerializedScriptValue> message = SerializedScriptValueFactory::instance().create(info.GetIsolate(), info[0], transferables, exceptionState); |
+ RefPtr<SerializedScriptValue> message = SerializedScriptValueFactory::instance().create(info.GetIsolate(), info[0], &transferables, exceptionState); |
if (exceptionState.throwIfNeeded()) |
return; |
// FIXME: Only pass context/exceptionState if instance really requires it. |
ExecutionContext* context = currentExecutionContext(info.GetIsolate()); |
- MessagePortArray* ports; |
- if (auto* messagePorts = TransferableMessagePort::get(*transferables)) |
- ports = &(messagePorts->getArray()); |
- else |
- ports = new MessagePortArray; |
- instance->postMessage(context, message.release(), ports, exceptionState); |
+ instance->postMessage(context, message.release(), transferables.messagePorts, exceptionState); |
exceptionState.throwIfNeeded(); |
} |