1 files changed, 15 insertions, 8 deletions
diff --git a/src/core/api/qwebenginepage_p.h b/src/core/api/qwebenginepage_p.h
index fa5ee135d..f0e179ea8 100644
--- a/src/core/api/qwebenginepage_p.h
+++ b/src/core/api/qwebenginepage_p.h
@@ -79,9 +79,12 @@ public:
     virtual void hideAutofillPopup() = 0;
     virtual QtWebEngineCore::TouchHandleDrawableDelegate *
     createTouchHandleDelegate(const QMap<int, QImage> &) = 0;
+    virtual void showTouchSelectionMenu(QtWebEngineCore::TouchSelectionMenuController *,
+                                        const QRect &) = 0;
+    virtual void hideTouchSelectionMenu() = 0;
 };
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEnginePagePrivate : public QtWebEngineCore::WebContentsAdapterClient
+class Q_WEBENGINECORE_EXPORT QWebEnginePagePrivate : public QtWebEngineCore::WebContentsAdapterClient
 {
 public:
     Q_DECLARE_PUBLIC(QWebEnginePage)
@@ -99,6 +102,7 @@ public:
     void titleChanged(const QString &) override;
     void urlChanged() override;
     void iconChanged(const QUrl &) override;
+    void zoomFactorChanged(qreal factor) override;
     void loadProgressChanged(int progress) override;
     void didUpdateTargetURL(const QUrl &) override;
     void selectionChanged() override;
@@ -119,14 +123,16 @@ public:
     bool isBeingAdopted() override;
     void close() override;
     void windowCloseRejected() override;
+    void desktopMediaRequested(QtWebEngineCore::DesktopMediaController *) override;
     void contextMenuRequested(QWebEngineContextMenuRequest *request) override;
-    void navigationRequested(int navigationType, const QUrl &url, bool &accepted, bool isMainFrame) override;
+    void navigationRequested(int navigationType, const QUrl &url, bool &accepted, bool isMainFrame, bool hasFormData) override;
     void requestFullScreenMode(const QUrl &origin, bool fullscreen) override;
     bool isFullScreenMode() const override;
     void javascriptDialog(QSharedPointer<QtWebEngineCore::JavaScriptDialogController>) override;
     void runFileChooser(QSharedPointer<QtWebEngineCore::FilePickerController>) override;
     void showColorDialog(QSharedPointer<QtWebEngineCore::ColorChooserController>) override;
-    void didRunJavaScript(quint64 requestId, const QVariant &result) override;
+    void runJavaScript(const QString &script, quint32 worldId, quint64 frameId,
+                       const std::function<void(const QVariant &)> &callback) override;
     void didFetchDocumentMarkup(quint64 requestId, const QString &result) override;
     void didFetchDocumentInnerText(quint64 requestId, const QString &result) override;
     void didPrintPage(quint64 requestId, QSharedPointer<QByteArray> result) override;
@@ -140,7 +146,6 @@ public:
     void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) override;
     void runFeaturePermissionRequest(QtWebEngineCore::ProfileAdapter::PermissionType permission, const QUrl &securityOrigin) override;
     void runMouseLockPermissionRequest(const QUrl &securityOrigin) override;
-    void runQuotaRequest(QWebEngineQuotaRequest) override;
     void runRegisterProtocolHandlerRequest(QWebEngineRegisterProtocolHandlerRequest) override;
     void runFileSystemAccessRequest(QWebEngineFileSystemAccessRequest) override;
     QObject *accessibilityParentObject() override;
@@ -160,14 +165,16 @@ public:
     void printRequested() override;
     QtWebEngineCore::TouchHandleDrawableDelegate *
     createTouchHandleDelegate(const QMap<int, QImage> &) override;
-    void showTouchSelectionMenu(QtWebEngineCore::TouchSelectionMenuController *, const QRect &, const QSize &) override { }
-    void hideTouchSelectionMenu() override { }
+    void showTouchSelectionMenu(QtWebEngineCore::TouchSelectionMenuController *, const QRect &,
+                                const QSize &) override;
+    void hideTouchSelectionMenu() override;
     const QObject *holdingQObject() const override;
     ClientType clientType() override { return QtWebEngineCore::WebContentsAdapterClient::WidgetsClient; }
     void findTextFinished(const QWebEngineFindTextResult &result) override;
     void showAutofillPopup(QtWebEngineCore::AutofillPopupController *controller,
                            const QRect &bounds, bool autoselectFirstSuggestion) override;
     void hideAutofillPopup() override;
+    void showWebAuthDialog(QWebEngineWebAuthUxRequest *controller) override;
 
     QtWebEngineCore::ProfileAdapter *profileAdapter() override;
     QtWebEngineCore::WebContentsAdapter *webContentsAdapter() override;
@@ -183,6 +190,8 @@ public:
     void setFullScreenMode(bool);
     void ensureInitialized() const;
 
+    static QString actionText(int action);
+
     QSharedPointer<QtWebEngineCore::WebContentsAdapter> adapter;
     QWebEngineHistory *history;
     QWebEngineProfile *profile;
@@ -197,7 +206,6 @@ public:
     QWebChannel *webChannel;
     unsigned int webChannelWorldId;
     QUrl iconUrl;
-    bool m_navigationActionTriggered;
     QPointer<QWebEnginePage> inspectedPage;
     QPointer<QWebEnginePage> devToolsPage;
     bool defaultAudioMuted;
@@ -208,7 +216,6 @@ public:
     QPrinter *currentPrinter = nullptr;
 #endif
 
-    mutable QMap<quint64, std::function<void(const QVariant &)>> m_variantCallbacks;
     mutable QMap<quint64, std::function<void(const QString &)>> m_stringCallbacks;
     QMap<quint64, std::function<void(const QByteArray &)>> m_pdfResultCallbacks;
     mutable QAction *actions[QWebEnginePage::WebActionCount];