1 files changed, 77 insertions, 2 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 72b16f28b..eafcf114c 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -23,10 +23,13 @@
 #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"
 #include "qwebenginehistory_p.h"
+#include "qwebengineprofile.h"
+#include "qwebengineprofile_p.h"
 #include "qwebenginesettings.h"
 #include "qwebenginesettings_p.h"
 #include "qwebengineview.h"
@@ -166,9 +169,10 @@ void CallbackDirectory::CallbackSharedDataPointer::doDeref()
     }
 }
 
-QWebEnginePagePrivate::QWebEnginePagePrivate()
+QWebEnginePagePrivate::QWebEnginePagePrivate(QWebEngineProfile *_profile)
     : adapter(new WebContentsAdapter)
     , history(new QWebEngineHistory(new QWebEngineHistoryPrivate(this)))
+    , profile(_profile ? _profile : QWebEngineProfile::defaultProfile())
     , settings(new QWebEngineSettings)
     , view(0)
     , isLoading(false)
@@ -342,6 +346,18 @@ void QWebEnginePagePrivate::runMediaAccessPermissionRequest(const QUrl &security
     Q_EMIT q->featurePermissionRequested(securityOrigin, requestedFeature);
 }
 
+void QWebEnginePagePrivate::runGeolocationPermissionRequest(const QUrl &securityOrigin)
+{
+    Q_Q(QWebEnginePage);
+    Q_EMIT q->featurePermissionRequested(securityOrigin, QWebEnginePage::Geolocation);
+}
+
+void QWebEnginePagePrivate::runMouseLockPermissionRequest(const QUrl &securityOrigin)
+{
+    Q_Q(QWebEnginePage);
+    Q_EMIT q->featurePermissionRequested(securityOrigin, QWebEnginePage::MouseLock);
+}
+
 QObject *QWebEnginePagePrivate::accessibilityParentObject()
 {
     return view;
@@ -410,9 +426,31 @@ void QWebEnginePagePrivate::recreateFromSerializedHistory(QDataStream &input)
     }
 }
 
+BrowserContextAdapter *QWebEnginePagePrivate::browserContextAdapter()
+{
+    return profile->d_ptr->browserContext();
+}
+
 QWebEnginePage::QWebEnginePage(QObject* parent)
     : QObject(parent)
-    , d_ptr(new QWebEnginePagePrivate)
+    , d_ptr(new QWebEnginePagePrivate())
+{
+    Q_D(QWebEnginePage);
+    d->q_ptr = this;
+    d->adapter->initialize(d);
+}
+
+/*!
+    Constructs an empty QWebEnginePage in the QWebEngineProfile \a profile with parent \a parent.
+
+    If the profile is not the default profile the caller must ensure the profile is alive for as
+    long as the page is.
+
+    \since 5.5
+*/
+QWebEnginePage::QWebEnginePage(QWebEngineProfile *profile, QObject* parent)
+    : QObject(parent)
+    , d_ptr(new QWebEnginePagePrivate(profile))
 {
     Q_D(QWebEnginePage);
     d->q_ptr = this;
@@ -448,6 +486,16 @@ QWidget *QWebEnginePage::view() const
     return d->view;
 }
 
+/*!
+    Returns the QWebEngineProfile the page belongs to.
+    \since 5.5
+*/
+QWebEngineProfile *QWebEnginePage::profile() const
+{
+    Q_D(const QWebEnginePage);
+    return d->profile;
+}
+
 bool QWebEnginePage::hasSelection() const
 {
     return !selectedText().isEmpty();
@@ -624,6 +672,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);
@@ -743,6 +798,8 @@ QMenu *QWebEnginePage::createStandardContextMenu()
 void QWebEnginePage::setFeaturePermission(const QUrl &securityOrigin, QWebEnginePage::Feature feature, QWebEnginePage::PermissionPolicy policy)
 {
     Q_D(QWebEnginePage);
+    if (policy == PermissionUnknown)
+        return;
     WebContentsAdapterClient::MediaRequestFlags flags =  WebContentsAdapterClient::MediaNone;
     switch (feature) {
     case MediaAudioVideoCapture:
@@ -761,6 +818,16 @@ void QWebEnginePage::setFeaturePermission(const QUrl &securityOrigin, QWebEngine
             }
             d->adapter->grantMediaAccessPermission(securityOrigin, flags);
         }
+        d->adapter->grantMediaAccessPermission(securityOrigin, flags);
+        break;
+    case QWebEnginePage::Geolocation:
+        d->adapter->runGeolocationRequestCallback(securityOrigin, (policy == PermissionGrantedByUser) ? true : false);
+        break;
+    case MouseLock:
+        if (policy == PermissionGrantedByUser)
+            d->adapter->grantMouseLockPermission(true);
+        else
+            d->adapter->grantMouseLockPermission(false);
         break;
     default:
         break;
@@ -945,6 +1012,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"