| Index: third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
|
| index ba81a9ce91638711c133473c8b3e41be3c454da9..5ff01d225932fbba3dd386ed5c8c593c0102e137 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
|
| @@ -37,6 +37,7 @@
|
| #include "bindings/core/v8/ScriptValueSerializer.h"
|
| #include "bindings/core/v8/SerializedScriptValueFactory.h"
|
| #include "bindings/core/v8/TransferableArrayBuffer.h"
|
| +#include "bindings/core/v8/TransferableExtractor.h"
|
| #include "bindings/core/v8/TransferableImageBitmap.h"
|
| #include "bindings/core/v8/V8ArrayBuffer.h"
|
| #include "bindings/core/v8/V8ImageBitmap.h"
|
| @@ -215,6 +216,7 @@ bool SerializedScriptValue::extractTransferables(v8::Isolate* isolate, v8::Local
|
| }
|
|
|
| v8::Local<v8::Object> transferrables = v8::Local<v8::Object>::Cast(value);
|
| + Vector<OwnPtr<TransferableExtractor>> extractors;
|
|
|
| // Validate the passed array of transferrables.
|
| for (unsigned i = 0; i < length; ++i) {
|
| @@ -226,6 +228,15 @@ bool SerializedScriptValue::extractTransferables(v8::Isolate* isolate, v8::Local
|
| exceptionState.throwTypeError("Value at index " + String::number(i) + " is an untransferable " + (transferrable->IsUndefined() ? "'undefined'" : "'null'") + " value.");
|
| return false;
|
| }
|
| + bool extractorDoneFlag = false;
|
| + for (const auto& ex : TransferableExtractor::getExtractors()) {
|
| + if (ex->extract(transferrable, isolate, transferables, exceptionState, i)) {
|
| + extractorDoneFlag = true;
|
| + break;
|
| + }
|
| + }
|
| + if (extractorDoneFlag)
|
| + break;
|
| // Validation of Objects implementing an interface, per WebIDL spec 4.1.15.
|
| if (V8MessagePort::hasInstance(transferrable, isolate)) {
|
| MessagePort* port = V8MessagePort::toImpl(v8::Local<v8::Object>::Cast(transferrable));
|
|
|