| 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 bf7ba0c1c0435a8a065e7c9be25a08c52a13d845..0049d6e66d02c98acfbcea0a046416fcee5317d9 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
|
| @@ -62,11 +62,10 @@ namespace blink {
|
| PassRefPtr<SerializedScriptValue> SerializedScriptValue::serialize(
|
| v8::Isolate* isolate,
|
| v8::Local<v8::Value> value,
|
| - Transferables* transferables,
|
| - WebBlobInfoArray* blobInfo,
|
| + const SerializeOptions& options,
|
| ExceptionState& exception) {
|
| - return SerializedScriptValueFactory::instance().create(
|
| - isolate, value, transferables, blobInfo, exception);
|
| + return SerializedScriptValueFactory::instance().create(isolate, value,
|
| + options, exception);
|
| }
|
|
|
| PassRefPtr<SerializedScriptValue>
|
| @@ -75,7 +74,7 @@ SerializedScriptValue::serializeAndSwallowExceptions(
|
| v8::Local<v8::Value> value) {
|
| DummyExceptionStateForTesting exceptionState;
|
| RefPtr<SerializedScriptValue> serialized =
|
| - serialize(isolate, value, nullptr, nullptr, exceptionState);
|
| + serialize(isolate, value, SerializeOptions(), exceptionState);
|
| if (exceptionState.hadException())
|
| return nullValue();
|
| return serialized.release();
|
| @@ -260,10 +259,9 @@ void SerializedScriptValue::transferArrayBuffers(
|
|
|
| v8::Local<v8::Value> SerializedScriptValue::deserialize(
|
| v8::Isolate* isolate,
|
| - MessagePortArray* messagePorts,
|
| - const WebBlobInfoArray* blobInfo) {
|
| - return SerializedScriptValueFactory::instance().deserialize(
|
| - this, isolate, messagePorts, blobInfo);
|
| + const DeserializeOptions& options) {
|
| + return SerializedScriptValueFactory::instance().deserialize(this, isolate,
|
| + options);
|
| }
|
|
|
| bool SerializedScriptValue::extractTransferables(
|
|
|