diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-25 15:45:22 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-27 11:27:53 +0200 |
| commit | 30ec6d65845938c14f14f543309160d445da700d (patch) | |
| tree | 0709daf648dac8cb63cddf3b1bf689dfde049908 /src/core/renderer/web_channel_ipc_transport.cpp | |
| parent | 7013cd858c1f2c84ad0e178f68c6cbfb6aed2530 (diff) | |
| parent | d96f8495b59878f50223a81a734ce0983539d8cf (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ibc1c881a67bf088ba6fb044e2553c74c7e9e24ca
Diffstat (limited to 'src/core/renderer/web_channel_ipc_transport.cpp')
| -rw-r--r-- | src/core/renderer/web_channel_ipc_transport.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp index f2e438233..8374a8e6b 100644 --- a/src/core/renderer/web_channel_ipc_transport.cpp +++ b/src/core/renderer/web_channel_ipc_transport.cpp @@ -105,7 +105,7 @@ void WebChannelTransport::Install(blink::WebFrame *frame, uint worldId) v8::HandleScope handleScope(isolate); v8::Handle<v8::Context> context; if (worldId == 0) - context = frame->MainWorldScriptContext(); + context = frame->ToWebLocalFrame()->MainWorldScriptContext(); else context = frame->ToWebLocalFrame()->IsolatedWorldScriptContext(worldId); v8::Context::Scope contextScope(context); @@ -126,7 +126,7 @@ void WebChannelTransport::Uninstall(blink::WebFrame *frame, uint worldId) v8::HandleScope handleScope(isolate); v8::Handle<v8::Context> context; if (worldId == 0) - context = frame->MainWorldScriptContext(); + context = frame->ToWebLocalFrame()->MainWorldScriptContext(); else context = frame->ToWebLocalFrame()->IsolatedWorldScriptContext(worldId); v8::Context::Scope contextScope(context); @@ -209,7 +209,7 @@ void WebChannelIPCTransport::dispatchWebChannelMessage(const std::vector<char> & blink::WebFrame *frame = webView->MainFrame(); v8::Handle<v8::Context> context; if (worldId == 0) - context = frame->MainWorldScriptContext(); + context = frame->ToWebLocalFrame()->MainWorldScriptContext(); else context = frame->ToWebLocalFrame()->IsolatedWorldScriptContext(worldId); v8::Context::Scope contextScope(context); @@ -239,7 +239,7 @@ void WebChannelIPCTransport::dispatchWebChannelMessage(const std::vector<char> & const int argc = 1; v8::Handle<v8::Value> argv[argc]; argv[0] = messageObject; - frame->CallFunctionEvenIfScriptDisabled(callback, webChannelObjectValue->ToObject(), argc, argv); + frame->ToWebLocalFrame()->CallFunctionEvenIfScriptDisabled(callback, webChannelObjectValue->ToObject(), argc, argv); } bool WebChannelIPCTransport::OnMessageReceived(const IPC::Message &message) |