Merge branch '5.6' into 5.7

Conflicts:
    src/core/api/qwebengineurlrequestinfo.cpp
    src/core/api/qwebengineurlrequestinfo.h
    src/core/core_gyp_generator.pro

Change-Id: I5c78f0c86f6dcd61697148f0729d3d3a2cb2c76f

11 files changed, 111 insertions, 13 deletions

diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp
index bd2fecac2..a3806fc63 100644
--- a/src/core/api/qwebengineurlrequestinfo.cpp
+++ b/src/core/api/qwebengineurlrequestinfo.cpp
@@ -64,7 +64,7 @@ ASSERT_ENUMS_MATCH(QWebEngineUrlRequestInfo::ResourceTypePing, content::RESOURCE
 ASSERT_ENUMS_MATCH(QWebEngineUrlRequestInfo::ResourceTypeServiceWorker, content::RESOURCE_TYPE_SERVICE_WORKER)
 ASSERT_ENUMS_MATCH(QWebEngineUrlRequestInfo::ResourceTypeCspReport, content::RESOURCE_TYPE_CSP_REPORT)
 ASSERT_ENUMS_MATCH(QWebEngineUrlRequestInfo::ResourceTypePluginResource, content::RESOURCE_TYPE_PLUGIN_RESOURCE)
-ASSERT_ENUMS_MATCH(QWebEngineUrlRequestInfo::ResourceTypeUnknown, content::RESOURCE_TYPE_LAST_TYPE)
+ASSERT_ENUMS_MATCH(QWebEngineUrlRequestInfo::ResourceTypeLast, content::RESOURCE_TYPE_LAST_TYPE)
 
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::LinkNavigation, QWebEngineUrlRequestInfo::NavigationTypeLink)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::TypedNavigation, QWebEngineUrlRequestInfo::NavigationTypeTyped)
@@ -175,6 +175,9 @@ QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfoPriva
            HTTP POST requests to specified servers. (Added in Qt 5.7)
    \value ResourceTypePluginResource  A resource requested by a plugin. (Added in Qt 5.7)
     \value ResourceTypeUnknown  Unknown request type.
+
+    \note For forward compatibility all values not matched should be treated as unknown,
+    not just \c ResourceTypeUnknown.
 */
 
 /*!
diff --git a/src/core/api/qwebengineurlrequestinfo.h b/src/core/api/qwebengineurlrequestinfo.h
index d75ceabf6..52463a1b3 100644
--- a/src/core/api/qwebengineurlrequestinfo.h
+++ b/src/core/api/qwebengineurlrequestinfo.h
@@ -75,7 +75,10 @@ public:
         ResourceTypeServiceWorker,  // the main resource of a service worker.
         ResourceTypeCspReport,      // Content Security Policy (CSP) violation report
         ResourceTypePluginResource, // A resource requested by a plugin
-        ResourceTypeUnknown
+#ifndef Q_QDOC
+        ResourceTypeLast,
+#endif
+        ResourceTypeUnknown = 255
     };
 
     enum NavigationType {
diff --git a/src/core/common/qt_ipc_logging.cpp b/src/core/common/qt_ipc_logging.cpp
new file mode 100644
index 000000000..124124de1
--- /dev/null
+++ b/src/core/common/qt_ipc_logging.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED
+
+#if defined(IPC_MESSAGE_LOG_ENABLED)
+#define IPC_MESSAGE_MACROS_LOG_ENABLED
+#include "content/public/common/content_ipc_logging.h"
+#define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \
+    content::RegisterIPCLogger(msg_id, logger)
+#include "common/qt_messages.h"
+#endif
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 7351b108c..d4e4d2388 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -46,6 +46,7 @@ SOURCES = \
         clipboard_qt.cpp \
         color_chooser_qt.cpp \
         color_chooser_controller.cpp \
+        common/qt_ipc_logging.cpp \
         common/qt_messages.cpp \
         common/user_script_data.cpp \
         content_client_qt.cpp \
diff --git a/src/core/network_delegate_qt.cpp b/src/core/network_delegate_qt.cpp
index ff0e8320c..ff66da3c7 100644
--- a/src/core/network_delegate_qt.cpp
+++ b/src/core/network_delegate_qt.cpp
@@ -58,7 +58,7 @@
 
 namespace QtWebEngineCore {
 
-int pageTransitionToNavigationType(ui::PageTransition transition)
+WebContentsAdapterClient::NavigationType pageTransitionToNavigationType(ui::PageTransition transition)
 {
     int32_t qualifier = ui::PageTransitionGetQualifier(transition);
 
@@ -81,6 +81,18 @@ int pageTransitionToNavigationType(ui::PageTransition transition)
     }
 }
 
+QWebEngineUrlRequestInfo::ResourceType toQt(content::ResourceType resourceType)
+{
+    if (resourceType >= 0 && resourceType < content::ResourceType(QWebEngineUrlRequestInfo::ResourceTypeLast))
+        return static_cast<QWebEngineUrlRequestInfo::ResourceType>(resourceType);
+    return QWebEngineUrlRequestInfo::ResourceTypeUnknown;
+}
+
+QWebEngineUrlRequestInfo::NavigationType toQt(WebContentsAdapterClient::NavigationType navigationType)
+{
+    return static_cast<QWebEngineUrlRequestInfo::NavigationType>(navigationType);
+}
+
 NetworkDelegateQt::NetworkDelegateQt(URLRequestContextGetterQt *requestContext)
     : m_requestContextGetter(requestContext)
 {
@@ -94,7 +106,7 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::C
     const content::ResourceRequestInfo *resourceInfo = content::ResourceRequestInfo::ForRequest(request);
 
     content::ResourceType resourceType = content::RESOURCE_TYPE_LAST_TYPE;
-    int navigationType = QWebEngineUrlRequestInfo::NavigationTypeOther;
+    WebContentsAdapterClient::NavigationType navigationType = WebContentsAdapterClient::OtherNavigation;
 
     if (resourceInfo) {
         resourceType = resourceInfo->GetResourceType();
@@ -105,11 +117,11 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::C
 
     QWebEngineUrlRequestInterceptor* interceptor = m_requestContextGetter->m_requestInterceptor;
     if (interceptor) {
-        QWebEngineUrlRequestInfoPrivate *infoPrivate = new QWebEngineUrlRequestInfoPrivate(static_cast<QWebEngineUrlRequestInfo::ResourceType>(resourceType)
-                                                                                           , static_cast<QWebEngineUrlRequestInfo::NavigationType>(navigationType)
-                                                                                           , qUrl
-                                                                                           , toQt(request->first_party_for_cookies())
-                                                                                           , QByteArray::fromStdString(request->method()));
+        QWebEngineUrlRequestInfoPrivate *infoPrivate = new QWebEngineUrlRequestInfoPrivate(toQt(resourceType),
+                                                                                           toQt(navigationType),
+                                                                                           qUrl,
+                                                                                           toQt(request->first_party_for_cookies()),
+                                                                                           QByteArray::fromStdString(request->method()));
         QWebEngineUrlRequestInfo requestInfo(infoPrivate);
         interceptor->interceptRequest(requestInfo);
         if (requestInfo.changed()) {
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 757ae853c..cf2121390 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -421,7 +421,7 @@ void WebContentsDelegateQt::requestGeolocationPermission(const QUrl &requestingO
     m_viewClient->runGeolocationPermissionRequest(requestingOrigin);
 }
 
-extern int pageTransitionToNavigationType(ui::PageTransition transition);
+extern WebContentsAdapterClient::NavigationType pageTransitionToNavigationType(ui::PageTransition transition);
 
 void WebContentsDelegateQt::launchExternalURL(const QUrl &url, ui::PageTransition page_transition, bool is_main_frame)
 {
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index df4031712..e84c91bd7 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -152,7 +152,16 @@ QWebEnginePagePrivate::~QWebEnginePagePrivate()
 
 RenderWidgetHostViewQtDelegate *QWebEnginePagePrivate::CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQtDelegateClient *client)
 {
-    return new RenderWidgetHostViewQtDelegateWidget(client);
+    // Set the QWebEngineView as the parent for a popup delegate, so that the new popup window
+    // responds properly to clicks in case the QWebEngineView is inside a modal QDialog. Setting the
+    // parent essentially notifies the OS that the popup window is part of the modal session, and
+    // should allow interaction.
+    // The new delegate will not be deleted by the parent view though, because we unset the parent
+    // when the parent is destroyed. The delegate will be destroyed by Chromium when the popup is
+    // dismissed.
+    // If the delegate is not for a popup, but for a newly created QWebEngineView, the parent is 0
+    // just like before.
+    return new RenderWidgetHostViewQtDelegateWidget(client, this->view);
 }
 
 void QWebEnginePagePrivate::titleChanged(const QString &title)
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 23a203eab..5ddd1724c 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -106,6 +106,21 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(Rende
     setAttribute(Qt::WA_AcceptTouchEvents);
     setAttribute(Qt::WA_OpaquePaintEvent);
     setAttribute(Qt::WA_AlwaysShowToolTips);
+
+    if (parent) {
+        // Unset the popup parent if the parent is being destroyed, thus making sure a double
+        // delete does not happen.
+        // Also in case the delegate is destroyed before its parent (when a popup is simply
+        // dismissed), this connection will automatically be removed by ~QObject(), preventing
+        // a use-after-free.
+        connect(parent, &QObject::destroyed,
+                this, &RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete);
+    }
+}
+
+void RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete()
+{
+    setParent(Q_NULLPTR);
 }
 
 void RenderWidgetHostViewQtDelegateWidget::initAsChild(WebContentsAdapterClient* container)
@@ -128,7 +143,11 @@ void RenderWidgetHostViewQtDelegateWidget::initAsPopup(const QRect& screenRect)
     // to be destroyed.
     setAttribute(Qt::WA_ShowWithoutActivating);
     setFocusPolicy(Qt::NoFocus);
-    setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
+
+    // macOS doesn't like Qt::ToolTip when QWebEngineView is inside a modal dialog, specifically by
+    // not forwarding click events to the popup. So we use Qt::Tool which behaves the same way, but
+    // works on macOS too.
+    setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
 
     setGeometry(screenRect);
     show();
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
index 7307bcd55..c0cbaa172 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
@@ -95,6 +95,7 @@ protected:
 
 private slots:
     void onWindowPosChanged();
+    void removeParentBeforeParentDelete();
 
 private:
     RenderWidgetHostViewQtDelegateClient *m_client;
diff --git a/tests/auto/widgets/qwebengineview/BLACKLIST b/tests/auto/widgets/qwebengineview/BLACKLIST
new file mode 100644
index 000000000..0a909d0f6
--- /dev/null
+++ b/tests/auto/widgets/qwebengineview/BLACKLIST
@@ -0,0 +1,2 @@
+[doNotSendMouseKeyboardEventsWhenDisabled]
+windows
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 23be1d2fa..c8fd278b4 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -155,7 +155,7 @@ defineReplace(getConfigDir) {
 }
 
 defineReplace(getChromiumSrcDir) {
-  git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir")
+  exists($$QTWEBENGINE_ROOT/.git): git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir")
   # Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used)
   isEmpty(git_chromium_src_dir): git_chromium_src_dir = "src/3rdparty/chromium"
   return($$git_chromium_src_dir)