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 740a8b16de28783d596f59bc2d9907b0af76744d..97b7b161d5e632fd089a3f7e41a579c099c92342 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>, MessagePortArray*, ArrayBufferArray*, WebBlobInfoArray*, ExceptionState&); |
- PassRefPtr<SerializedScriptValue> create(v8::Isolate*, v8::Local<v8::Value>, MessagePortArray*, ArrayBufferArray*, ExceptionState&); |
+ virtual PassRefPtr<SerializedScriptValue> create(v8::Isolate*, v8::Local<v8::Value>, MessagePortArray*, ArrayBufferArray*, ImageBitmapArray*, WebBlobInfoArray*, ExceptionState&); |
+ PassRefPtr<SerializedScriptValue> create(v8::Isolate*, v8::Local<v8::Value>, MessagePortArray*, ArrayBufferArray*, ImageBitmapArray*, ExceptionState&); |
PassRefPtr<SerializedScriptValue> createFromWire(const String&); |
PassRefPtr<SerializedScriptValue> createFromWireBytes(const char* data, size_t length); |
PassRefPtr<SerializedScriptValue> create(const String&); |
@@ -56,11 +56,11 @@ public: |
} |
protected: |
- ScriptValueSerializer::Status doSerialize(v8::Local<v8::Value>, SerializedScriptValueWriter&, MessagePortArray*, ArrayBufferArray*, WebBlobInfoArray*, SerializedScriptValue*, v8::TryCatch&, String& errorMessage, v8::Isolate*); |
- virtual ScriptValueSerializer::Status doSerialize(v8::Local<v8::Value>, SerializedScriptValueWriter&, MessagePortArray*, ArrayBufferArray*, WebBlobInfoArray*, BlobDataHandleMap&, v8::TryCatch&, String& errorMessage, v8::Isolate*); |
- void transferData(SerializedScriptValue*, SerializedScriptValueWriter&, ArrayBufferArray*, ExceptionState&, v8::Isolate*); |
+ ScriptValueSerializer::Status doSerialize(v8::Local<v8::Value>, SerializedScriptValueWriter&, MessagePortArray*, ArrayBufferArray*, ImageBitmapArray*, WebBlobInfoArray*, SerializedScriptValue*, v8::TryCatch&, String& errorMessage, v8::Isolate*); |
+ virtual ScriptValueSerializer::Status doSerialize(v8::Local<v8::Value>, SerializedScriptValueWriter&, MessagePortArray*, ArrayBufferArray*, ImageBitmapArray*, WebBlobInfoArray*, BlobDataHandleMap&, v8::TryCatch&, String& errorMessage, v8::Isolate*); |
+ void transferData(SerializedScriptValue*, SerializedScriptValueWriter&, ArrayBufferArray*, ImageBitmapArray*, ExceptionState&, v8::Isolate*); |
- virtual v8::Local<v8::Value> deserialize(String& data, BlobDataHandleMap& blobDataHandles, ArrayBufferContentsArray*, v8::Isolate*, MessagePortArray* messagePorts, const WebBlobInfoArray*); |
+ virtual v8::Local<v8::Value> deserialize(String& data, BlobDataHandleMap& blobDataHandles, ArrayBufferContentsArray*, ImageBitmapArray*, v8::Isolate*, MessagePortArray* messagePorts, const WebBlobInfoArray*); |
private: |
static SerializedScriptValueFactory* m_instance; |