diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-11-02 18:20:14 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-11-08 06:38:35 +0000 |
| commit | c15c0f5620a15996f4d178e628f5bd401ab34279 (patch) | |
| tree | ed98770592da59c7b79f3e01b1a6ff8b2aec87e8 /src/core/renderer/web_channel_ipc_transport.cpp | |
| parent | 4abee8c89a47592fecd4c0f9247efa600710a06b (diff) | |
Fix crash when trying to execute script on a detached RenderFrame
Task-number: QTBUG-56661
Change-Id: I546222dde64c54955c62d2c30df79d4773b9973c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/renderer/web_channel_ipc_transport.cpp')
| -rw-r--r-- | src/core/renderer/web_channel_ipc_transport.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp index 3a44bb182..2ca6640c6 100644 --- a/src/core/renderer/web_channel_ipc_transport.cpp +++ b/src/core/renderer/web_channel_ipc_transport.cpp @@ -164,9 +164,8 @@ void WebChannelIPCTransport::RunScriptsAtDocumentStart(content::RenderFrame *ren { // JavaScript run before this point doesn't stick, and needs to be redone. // ### FIXME: we should try no even installing before - blink::WebLocalFrame *frame = render_frame->GetWebFrame(); if (m_installed && render_frame->IsMainFrame()) - WebChannelTransport::Install(frame, m_installedWorldId); + WebChannelTransport::Install(render_frame->GetWebFrame(), m_installedWorldId); } |