Ensure WebContents::WasShown/WasHidden are called

Forward WebEngineView visibility to WebContents visibility, and call
WebContentsView visibiliy on actual show/hide events to avoid a recursion
when WebContents visbility triggers it.

Change-Id: I0c336359fb35bf93874aa1092767177d7a5ce341
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 76ca8d354..57631c4cc 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -139,14 +139,12 @@ void RenderWidgetHostViewQtDelegateWidget::show()
     // want to show anything else than popups as top-level.
     if (parent() || m_isPopup) {
         QOpenGLWidget::show();
-        m_client->notifyShown();
     }
 }
 
 void RenderWidgetHostViewQtDelegateWidget::hide()
 {
     QOpenGLWidget::hide();
-    m_client->notifyHidden();
 }
 
 bool RenderWidgetHostViewQtDelegateWidget::isVisible() const
@@ -257,6 +255,13 @@ void RenderWidgetHostViewQtDelegateWidget::showEvent(QShowEvent *event)
         m_windowConnections.append(connect(w, SIGNAL(yChanged(int)), SLOT(onWindowPosChanged())));
     }
     m_client->windowChanged();
+    m_client->notifyShown();
+}
+
+void RenderWidgetHostViewQtDelegateWidget::hideEvent(QHideEvent *event)
+{
+    QOpenGLWidget::hideEvent(event);
+    m_client->notifyHidden();
 }
 
 bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)