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

Conflicts:
    src/3rdparty

Change-Id: Ib9c9eca457c1c42dab948e6cb56d44b57d5da32a

1 files changed, 19 insertions, 7 deletions

diff --git a/src/core/network_delegate_qt.cpp b/src/core/network_delegate_qt.cpp
index ed54f2ec8..9b4c415c9 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()) {