| Index: third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp b/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp
|
| index 37114ffc27f6c1e3920e8bbc2a7aeda2ca9c8a42..71fe644b20fd09a13439e3e89f9e760ea8dc3382 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp
|
| @@ -48,6 +48,7 @@
|
| #include "core/dom/ExceptionCode.h"
|
| #include "core/dom/MessagePort.h"
|
| #include "core/frame/FrameView.h"
|
| +#include "core/frame/ImageBitmap.h"
|
| #include "core/frame/LocalDOMWindow.h"
|
| #include "core/frame/LocalFrame.h"
|
| #include "core/frame/Settings.h"
|
| @@ -198,6 +199,7 @@ void V8Window::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::Value>
|
| // postMessage(message, {sequence of transferrables}, targetOrigin);
|
| OwnPtrWillBeRawPtr<MessagePortArray> portArray = adoptPtrWillBeNoop(new MessagePortArray);
|
| ArrayBufferArray arrayBufferArray;
|
| + ImageBitmapArray imageBitmapArray;
|
| int targetOriginArgIndex = 1;
|
| if (info.Length() > 2) {
|
| int transferablesArgIndex = 2;
|
| @@ -206,14 +208,14 @@ void V8Window::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::Value>
|
| targetOriginArgIndex = 2;
|
| transferablesArgIndex = 1;
|
| }
|
| - if (!SerializedScriptValue::extractTransferables(info.GetIsolate(), info[transferablesArgIndex], transferablesArgIndex, *portArray, arrayBufferArray, exceptionState)) {
|
| + if (!SerializedScriptValue::extractTransferables(info.GetIsolate(), info[transferablesArgIndex], transferablesArgIndex, *portArray, arrayBufferArray, imageBitmapArray, exceptionState)) {
|
| exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| }
|
| TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, targetOrigin, info[targetOriginArgIndex]);
|
|
|
| - RefPtr<SerializedScriptValue> message = SerializedScriptValueFactory::instance().create(info.GetIsolate(), info[0], portArray.get(), &arrayBufferArray, exceptionState);
|
| + RefPtr<SerializedScriptValue> message = SerializedScriptValueFactory::instance().create(info.GetIsolate(), info[0], portArray.get(), &arrayBufferArray, &imageBitmapArray, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
|
|
|
|