Index: third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueFactory.h |
diff --git a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueFactory.h b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueFactory.h |
index dfc5f7cd4613924d5a9aeeab8d6c6fe7a8378252..28dd617f595c479c916f10f54712140faf0f2821 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueFactory.h |
+++ b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueFactory.h |
@@ -24,8 +24,8 @@ public: |
// be thrown using v8::ThrowException(), and sets |didThrow|. In this case |
// the caller must not invoke any V8 operations until control returns to |
// V8. When serialization is successful, |didThrow| is false. |
- virtual PassRefPtr<SerializedScriptValue> create(v8::Isolate*, v8::Local<v8::Value>, TransferableArray*, WebBlobInfoArray*, ExceptionState&); |
- PassRefPtr<SerializedScriptValue> create(v8::Isolate*, v8::Local<v8::Value>, TransferableArray*, ExceptionState&); |
+ virtual PassRefPtr<SerializedScriptValue> create(v8::Isolate*, v8::Local<v8::Value>, Transferables*, WebBlobInfoArray*, ExceptionState&); |
+ PassRefPtr<SerializedScriptValue> create(v8::Isolate*, v8::Local<v8::Value>, Transferables*, ExceptionState&); |
PassRefPtr<SerializedScriptValue> createFromWire(const String&); |
PassRefPtr<SerializedScriptValue> createFromWireBytes(const char* data, size_t length); |
PassRefPtr<SerializedScriptValue> create(const String&); |
@@ -56,9 +56,9 @@ public: |
} |
protected: |
- ScriptValueSerializer::Status doSerialize(v8::Local<v8::Value>, SerializedScriptValueWriter&, TransferableArray*, WebBlobInfoArray*, SerializedScriptValue*, v8::TryCatch&, String& errorMessage, v8::Isolate*); |
- virtual ScriptValueSerializer::Status doSerialize(v8::Local<v8::Value>, SerializedScriptValueWriter&, TransferableArray*, WebBlobInfoArray*, BlobDataHandleMap&, v8::TryCatch&, String& errorMessage, v8::Isolate*); |
- void transferData(SerializedScriptValue*, SerializedScriptValueWriter&, TransferableArray*, ExceptionState&, v8::Isolate*); |
+ ScriptValueSerializer::Status doSerialize(v8::Local<v8::Value>, SerializedScriptValueWriter&, Transferables*, WebBlobInfoArray*, SerializedScriptValue*, v8::TryCatch&, String& errorMessage, v8::Isolate*); |
+ virtual ScriptValueSerializer::Status doSerialize(v8::Local<v8::Value>, SerializedScriptValueWriter&, Transferables*, WebBlobInfoArray*, BlobDataHandleMap&, v8::TryCatch&, String& errorMessage, v8::Isolate*); |
+ void transferData(SerializedScriptValue*, SerializedScriptValueWriter&, Transferables*, ExceptionState&, v8::Isolate*); |
virtual v8::Local<v8::Value> deserialize(String& data, BlobDataHandleMap& blobDataHandles, ArrayBufferContentsArray*, ImageBitmapContentsArray*, v8::Isolate*, MessagePortArray* messagePorts, const WebBlobInfoArray*); |