Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/core/content_browser_client_qt.cpp
	src/core/content_browser_client_qt.h
	src/core/gl_surface_qt.cpp
	src/core/print_view_manager_qt.cpp
	src/core/web_contents_delegate_qt.cpp
	src/core/web_engine_context.cpp
	src/webengine/doc/src/qtwebengine-overview.qdoc
	src/webengine/doc/src/qtwebengine-platform-notes.qdoc
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
	src/webenginewidgets/webenginewidgets.pro
	sync.profile

Change-Id: I44495f4d899580c882d6b86d68d7f6b77c8e91f6

3 files changed, 18 insertions, 0 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 1004b3e92..ca160c362 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -333,6 +333,11 @@ void QWebEnginePagePrivate::adoptNewWindowImpl(QWebEnginePage *newPage,
     if (!initialGeometry.isEmpty())
         emit newPage->geometryChangeRequested(initialGeometry);
 
+    // If the constructor of the QWebEnginePage descendant set a web channel,
+    // set it on the new adapter.
+    newWebContents->setWebChannel(newPage->d_func()->webChannel
+                                  , newPage->d_func()->webChannelWorldId);
+
     // Page has finished the adoption process.
     newPage->d_func()->m_isBeingAdopted = false;
 }
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp
index 6171391e3..8b4053e73 100644
--- a/src/webenginewidgets/api/qwebengineview.cpp
+++ b/src/webenginewidgets/api/qwebengineview.cpp
@@ -107,6 +107,7 @@ static QAccessibleInterface *webAccessibleFactory(const QString &, QObject *obje
 QWebEngineViewPrivate::QWebEngineViewPrivate()
     : page(0)
     , m_pendingContextMenuEvent(false)
+    , m_dragEntered(false)
 {
 #ifndef QT_NO_ACCESSIBILITY
     QAccessible::installFactory(&webAccessibleFactory);
@@ -350,7 +351,10 @@ void QWebEngineView::dragEnterEvent(QDragEnterEvent *e)
 {
     Q_D(QWebEngineView);
     e->accept();
+    if (d->m_dragEntered)
+        d->page->d_ptr->adapter->leaveDrag();
     d->page->d_ptr->adapter->enterDrag(e, mapToGlobal(e->pos()));
+    d->m_dragEntered = true;
 }
 
 /*!
@@ -359,8 +363,11 @@ void QWebEngineView::dragEnterEvent(QDragEnterEvent *e)
 void QWebEngineView::dragLeaveEvent(QDragLeaveEvent *e)
 {
     Q_D(QWebEngineView);
+    if (!d->m_dragEntered)
+        return;
     e->accept();
     d->page->d_ptr->adapter->leaveDrag();
+    d->m_dragEntered = false;
 }
 
 /*!
@@ -369,6 +376,8 @@ void QWebEngineView::dragLeaveEvent(QDragLeaveEvent *e)
 void QWebEngineView::dragMoveEvent(QDragMoveEvent *e)
 {
     Q_D(QWebEngineView);
+    if (!d->m_dragEntered)
+        return;
     QtWebEngineCore::WebContentsAdapter *adapter = d->page->d_ptr->adapter.data();
     Qt::DropAction dropAction = adapter->updateDragPosition(e, mapToGlobal(e->pos()));
     if (Qt::IgnoreAction == dropAction) {
@@ -385,8 +394,11 @@ void QWebEngineView::dragMoveEvent(QDragMoveEvent *e)
 void QWebEngineView::dropEvent(QDropEvent *e)
 {
     Q_D(QWebEngineView);
+    if (!d->m_dragEntered)
+        return;
     e->accept();
     d->page->d_ptr->adapter->endDragging(e->pos(), mapToGlobal(e->pos()));
+    d->m_dragEntered = false;
 }
 
 #ifndef QT_NO_ACCESSIBILITY
diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h
index b98c553f4..45b3e266e 100644
--- a/src/webenginewidgets/api/qwebengineview_p.h
+++ b/src/webenginewidgets/api/qwebengineview_p.h
@@ -71,6 +71,7 @@ public:
 
     QWebEnginePage *page;
     bool m_pendingContextMenuEvent;
+    bool m_dragEntered;
 };
 
 #ifndef QT_NO_ACCESSIBILITY