Add setRequestInterceptor to QWebEnginePage

Makes it possible to make page specific intercepts, and is at the same
time safer by running in the UI-thread.

[ChangeLog][QtWebEngineWidgets][QWebEnginePage] Added
setRequestInterceptor, similar to the same call on profile except
it operates on a per-page basis and on the UI-thread.

Change-Id: Id5a7173156c25d0f030f00b6ef314d283c7c8cdd
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

2 files changed, 26 insertions, 3 deletions

diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp
index 2bb870071..79bfb5412 100644
--- a/src/core/api/qwebengineurlrequestinfo.cpp
+++ b/src/core/api/qwebengineurlrequestinfo.cpp
@@ -115,8 +115,11 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::OtherNavigation, Q
     \fn void QWebEngineUrlRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info)
 
     Reimplementing this virtual function makes it possible to intercept URL
-    requests. This function is executed on the IO thread, and therefore running
-    long tasks here will block networking.
+    requests. For interceptors installed on a QWebEngineProfile, the function is executed
+    on the I/O thread, and thus it may not be thread-safe to interact with pages. If the
+    interceptor was installed on a QWebEnginePage, the function is executed on the main
+    application thread, and can safely interact with other user classes. Both versions will
+    be stalling the URL request until handled.
 
     \a info contains the information about the URL request and will track internally
     whether its members have been altered.
@@ -137,10 +140,17 @@ QWebEngineUrlRequestInfoPrivate::QWebEngineUrlRequestInfoPrivate(QWebEngineUrlRe
 /*!
     \internal
 */
+QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfo &&p)
+    : d_ptr(p.d_ptr.take())
+{
+}
+
+/*!
+    \internal
+*/
 
 QWebEngineUrlRequestInfo::~QWebEngineUrlRequestInfo()
 {
-
 }
 
 /*!
@@ -257,6 +267,14 @@ bool QWebEngineUrlRequestInfo::changed() const
 }
 
 /*!
+    \internal
+*/
+void QWebEngineUrlRequestInfo::resetChanged()
+{
+    d_ptr->changed = false;
+}
+
+/*!
     Redirects this request to \a url.
     It is only possible to redirect requests that do not have payload data, such as GET requests.
 */
diff --git a/src/core/api/qwebengineurlrequestinfo.h b/src/core/api/qwebengineurlrequestinfo.h
index 68c46dcf4..e1f9ca6ef 100644
--- a/src/core/api/qwebengineurlrequestinfo.h
+++ b/src/core/api/qwebengineurlrequestinfo.h
@@ -47,6 +47,7 @@
 
 namespace QtWebEngineCore {
 class NetworkDelegateQt;
+class URLRequestNotification;
 }
 
 QT_BEGIN_NAMESPACE
@@ -104,10 +105,14 @@ public:
 
 private:
     friend class QtWebEngineCore::NetworkDelegateQt;
+    friend class QtWebEngineCore::URLRequestNotification;
     Q_DISABLE_COPY(QWebEngineUrlRequestInfo)
     Q_DECLARE_PRIVATE(QWebEngineUrlRequestInfo)
 
+    void resetChanged();
+
     QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfoPrivate *p);
+    QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfo &&p);
     ~QWebEngineUrlRequestInfo();
     QScopedPointer<QWebEngineUrlRequestInfoPrivate> d_ptr;
 };