Fix QWebEngineView to page reattachment.

This fixes the crash in tst_QWebEngineView::reusePage.
Also add a test to check the case where show() would react incorrectly.

Change-Id: I40247c7c225d74b26675b6a7fa5ff1f06d3bb3e6
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 6ca8e0d8e..a670903fe 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -152,6 +152,7 @@ private Q_SLOTS:
     void userAgentApplicationName();
     void userAgentNewlineStripping();
     void undoActionHaveCustomText();
+    void renderWidgetHostViewNotShowTopLevel();
 
     void viewModes();
 
@@ -3534,6 +3535,28 @@ void tst_QWebEnginePage::undoActionHaveCustomText()
 #endif
 }
 
+void tst_QWebEnginePage::renderWidgetHostViewNotShowTopLevel()
+{
+    QWebEnginePage page;
+    QSignalSpy spyLoadFinished(&page, SIGNAL(loadFinished(bool)));
+
+    page.load(QUrl("http://qt-project.org"));
+    if (!spyLoadFinished.wait(10000) || !spyLoadFinished.at(0).at(0).toBool())
+        QSKIP("Couldn't load page from network, skipping test.");
+    spyLoadFinished.clear();
+
+    // Loading a different domain will force the creation of a separate render
+    // process and should therefore create a new RenderWidgetHostViewQtDelegateWidget.
+    page.load(QUrl("http://www.wikipedia.org/"));
+    if (!spyLoadFinished.wait(10000) || !spyLoadFinished.at(0).at(0).toBool())
+        QSKIP("Couldn't load page from network, skipping test.");
+
+    // Make sure that RenderWidgetHostViewQtDelegateWidgets are not shown as top-level.
+    // They should only be made visible when parented to a QWebEngineView.
+    foreach (QWidget *widget, QApplication::topLevelWidgets())
+        QCOMPARE(widget->isVisible(), false);
+}
+
 void tst_QWebEnginePage::openWindowDefaultSize()
 {
 #if !defined(QWEBENGINEPAGE_EVALUATEJAVASCRIPT)