Index: third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.h |
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.h b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.h |
index 15b23b9623ba313238597fb1125296fbac38168d..3639ef82dfd78ae0cbe09c89d28cc53dc6a4dea0 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.h |
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.h |
@@ -143,7 +143,7 @@ protected: |
void writeArrayBufferView(const DOMArrayBufferView&); |
void doWriteImageData(uint32_t width, uint32_t height, const uint8_t* pixelData, uint32_t pixelDataLength); |
void writeImageData(uint32_t width, uint32_t height, const uint8_t* pixelData, uint32_t pixelDataLength); |
- void writeImageBitmap(uint32_t width, uint32_t height, uint32_t isOriginClean, const uint8_t* pixelData, uint32_t pixelDataLength); |
+ void writeImageBitmap(uint32_t width, uint32_t height, uint32_t isOriginClean, uint32_t isPremultiplied, const uint8_t* pixelData, uint32_t pixelDataLength); |
void writeRegExp(v8::Local<v8::String> pattern, v8::RegExp::Flags); |
void writeTransferredMessagePort(uint32_t index); |
void writeTransferredArrayBuffer(uint32_t index); |
@@ -518,7 +518,7 @@ private: |
bool readDate(v8::Local<v8::Value>*); |
bool readNumber(v8::Local<v8::Value>*); |
bool readNumberObject(v8::Local<v8::Value>*); |
- ImageData* doReadImageData(); |
+ bool doReadImageDataProperties(uint32_t*, uint32_t*, uint32_t*); |
bool readImageData(v8::Local<v8::Value>*); |
bool readImageBitmap(v8::Local<v8::Value>*); |
bool readCompositorProxy(v8::Local<v8::Value>*); |