4 files changed, 59 insertions, 1 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 72b16f28b..e3ab2ec0d 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -23,6 +23,7 @@
 #include "qwebenginepage.h"
 #include "qwebenginepage_p.h"
 
+#include "browser_context_adapter.h"
 #include "certificate_error_controller.h"
 #include "javascript_dialog_controller.h"
 #include "qwebenginehistory.h"
@@ -410,6 +411,11 @@ void QWebEnginePagePrivate::recreateFromSerializedHistory(QDataStream &input)
     }
 }
 
+BrowserContextAdapter *QWebEnginePagePrivate::browserContextAdapter()
+{
+    return BrowserContextAdapter::defaultContext();
+}
+
 QWebEnginePage::QWebEnginePage(QObject* parent)
     : QObject(parent)
     , d_ptr(new QWebEnginePagePrivate)
@@ -624,6 +630,13 @@ bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData
     return true;
 }
 
+void QWebEnginePagePrivate::navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame)
+{
+    Q_Q(QWebEnginePage);
+    bool accepted = q->acceptNavigationRequest(url, static_cast<QWebEnginePage::NavigationType>(navigationType), isMainFrame);
+    navigationRequestAction = accepted ? WebContentsAdapterClient::AcceptRequest : WebContentsAdapterClient::IgnoreRequest;
+}
+
 void QWebEnginePagePrivate::javascriptDialog(QSharedPointer<JavaScriptDialogController> controller)
 {
     Q_Q(QWebEnginePage);
@@ -945,6 +958,14 @@ bool QWebEnginePage::certificateError(const QWebEngineCertificateError &)
     return false;
 }
 
+bool QWebEnginePage::acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame)
+{
+    Q_UNUSED(url);
+    Q_UNUSED(type);
+    Q_UNUSED(isMainFrame);
+    return true;
+}
+
 QT_END_NAMESPACE
 
 #include "moc_qwebenginepage.cpp"
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 7856b8243..afb62ceda 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -136,6 +136,16 @@ public:
         PermissionDeniedByUser
     };
 
+    // must match WebContentsAdapterClient::NavigationType
+    enum NavigationType {
+        NavigationTypeLinkClicked,
+        NavigationTypeTyped,
+        NavigationTypeFormSubmitted,
+        NavigationTypeBackForward,
+        NavigationTypeReload,
+        NavigationTypeOther
+    };
+
     enum Feature {
 #ifndef Q_QDOC
         Notifications = 0,
@@ -248,6 +258,7 @@ protected:
     virtual bool javaScriptPrompt(const QUrl &securityOrigin, const QString& msg, const QString& defaultValue, QString* result);
     virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID);
     virtual bool certificateError(const QWebEngineCertificateError &certificateError);
+    virtual bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame);
 
 private:
     Q_DECLARE_PRIVATE(QWebEnginePage);
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index 54129229f..6424c3b0b 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -122,7 +122,7 @@ public:
     virtual void adoptNewWindow(WebContentsAdapter *newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &initialGeometry) Q_DECL_OVERRIDE;
     virtual void close() Q_DECL_OVERRIDE;
     virtual bool contextMenuRequested(const WebEngineContextMenuData &data) Q_DECL_OVERRIDE;
-    virtual void navigationRequested(int, const QUrl &, int &, bool) Q_DECL_OVERRIDE { }
+    virtual void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) Q_DECL_OVERRIDE;
     virtual void requestFullScreen(bool) Q_DECL_OVERRIDE { }
     virtual bool isFullScreen() const Q_DECL_OVERRIDE { return false; }
     virtual void javascriptDialog(QSharedPointer<JavaScriptDialogController>) Q_DECL_OVERRIDE;
@@ -139,6 +139,8 @@ public:
     virtual WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE;
     virtual void allowCertificateError(const QExplicitlySharedDataPointer<CertificateErrorController> &controller) Q_DECL_OVERRIDE;
 
+    virtual BrowserContextAdapter *browserContextAdapter() Q_DECL_OVERRIDE;
+
     void updateAction(QWebEnginePage::WebAction) const;
     void updateNavigationActions();
     void _q_webActionTriggered(bool checked);
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index e89b10ab8..af435d170 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -147,6 +147,21 @@
 */
 
 /*!
+    \enum QWebEnginePage::NavigationType
+
+    This enum describes the type of a navigation request.
+
+    \value NavigationTypeLinkClicked The navigation request resulted from a clicked link.
+    \value NavigationTypeTyped The navigation request resulted from an explicitly loaded url.
+    \value NavigationTypeFormSubmitted The navigation request resulted from a form submission.
+    \value NavigationTypeBackForward The navigation request resulted from a back/forward action.
+    \value NavigationTypeReload The navigation request resulted from a reload action.
+    \value NavigationTypeOther The navigation request was triggered by other means not covered by the above.
+
+    \sa acceptNavigationRequest()
+*/
+
+/*!
     \enum QWebEnginePage::Feature
 
     This enum describes the platform feature access categories that the user may be asked to grant or deny access to.
@@ -209,6 +224,15 @@
 */
 
 /*!
+    \fn bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame)
+    This function is called whenever there is a request to navigate to a specified \a url by means of the specified navigation type \atype.
+    The \a isMainFrame argument marks if the request corresponds to the main frame, or a sub frame.
+    If the request is accepted Chromium will continue to load the page, else the request will be ignored.
+    The default implementation accepts the navigation request.
+*/
+
+
+/*!
     \fn void QWebEnginePage::javaScriptAlert(const QUrl &securityOrigin, const QString& msg)
     This function is called whenever a JavaScript program running in a frame affiliated with \a securityOrigin calls the alert() function with
     the message \a msg.