summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-06-25 17:33:34 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-06-26 09:57:14 +0000
commit69f122c39844128bd2714180feb092db3de5a31a (patch)
tree95626c90e4947f48d07ab678c6885dbe555c575d /src/core
parentdd78b4c3d9673b12eb3006140b80056273d4a815 (diff)
Fix crash when navigating an adopted window
If the original opener has been closed, the factory client might point at a wrong object. To avoid that we can update it when we get the real client. It does not matter for CreateRenderWidgetHostViewQtDelegate which object it is called on. Change-Id: I7161e7436fca45c41f51cab8983d9c7214f11047 Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/web_contents_view_qt.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/web_contents_view_qt.cpp b/src/core/web_contents_view_qt.cpp
index 932170634..af0c1fe38 100644
--- a/src/core/web_contents_view_qt.cpp
+++ b/src/core/web_contents_view_qt.cpp
@@ -50,6 +50,7 @@ namespace QtWebEngineCore {
void WebContentsViewQt::initialize(WebContentsAdapterClient* client)
{
m_client = client;
+ m_factoryClient = client;
// Check if a RWHV was created before the initialization.
if (m_webContents->GetRenderWidgetHostView())