Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I5d0d5f65575256673c35558e0fcbf749a1439793

1 files changed, 14 insertions, 5 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index d2fb7f19a..aa450003c 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -275,7 +275,7 @@ bool QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenu
         QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::InspectElement); });
         ui()->addMenuItem(item, QQuickWebEngineView::tr("Inspect Element"));
     }
-    if (isFullScreen()) {
+    if (isFullScreenMode()) {
         item = new MenuItemHandler(menu);
         QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::ExitFullScreen); });
         ui()->addMenuItem(item, QQuickWebEngineView::tr("Exit Full Screen Mode"));
@@ -519,14 +519,14 @@ void QQuickWebEngineViewPrivate::windowCloseRejected()
 #endif
 }
 
-void QQuickWebEngineViewPrivate::requestFullScreen(bool fullScreen)
+void QQuickWebEngineViewPrivate::requestFullScreenMode(const QUrl &origin, bool fullscreen)
 {
     Q_Q(QQuickWebEngineView);
-    QQuickWebEngineFullScreenRequest request(this, fullScreen);
+    QQuickWebEngineFullScreenRequest request(this, origin, fullscreen);
     Q_EMIT q->fullScreenRequested(request);
 }
 
-bool QQuickWebEngineViewPrivate::isFullScreen() const
+bool QQuickWebEngineViewPrivate::isFullScreenMode() const
 {
     return m_isFullScreen;
 }
@@ -1392,8 +1392,9 @@ QQuickWebEngineFullScreenRequest::QQuickWebEngineFullScreenRequest()
 {
 }
 
-QQuickWebEngineFullScreenRequest::QQuickWebEngineFullScreenRequest(QQuickWebEngineViewPrivate *viewPrivate, bool toggleOn)
+QQuickWebEngineFullScreenRequest::QQuickWebEngineFullScreenRequest(QQuickWebEngineViewPrivate *viewPrivate, const QUrl &origin, bool toggleOn)
     : viewPrivate(viewPrivate)
+    , m_origin(origin)
     , m_toggleOn(toggleOn)
 {
 }
@@ -1402,10 +1403,18 @@ void QQuickWebEngineFullScreenRequest::accept()
 {
     if (viewPrivate && viewPrivate->m_isFullScreen != m_toggleOn) {
         viewPrivate->m_isFullScreen = m_toggleOn;
+        viewPrivate->adapter->changedFullScreen();
         Q_EMIT viewPrivate->q_ptr->isFullScreenChanged();
     }
 }
 
+void QQuickWebEngineFullScreenRequest::reject()
+{
+    if (viewPrivate) {
+        viewPrivate->adapter->changedFullScreen();
+    }
+}
+
 QQuickWebEngineViewExperimental::QQuickWebEngineViewExperimental(QQuickWebEngineViewPrivate *viewPrivate)
     : q_ptr(0)
     , d_ptr(viewPrivate)