1 files changed, 42 insertions, 9 deletions

diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
index 62c3f087c..66736dd21 100644
--- a/src/core/web_contents_adapter.h
+++ b/src/core/web_contents_adapter.h
@@ -16,17 +16,23 @@
 #define WEB_CONTENTS_ADAPTER_H
 
 #include <QtCore/QSharedPointer>
+#include <QtCore/QMap>
 #include <QtCore/QString>
 #include <QtCore/QUrl>
+#include <QtCore/QVariant>
 #include <QtCore/QPointer>
 #include <QtGui/qtgui-config.h>
 #include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 #include <QtWebEngineCore/qwebenginecontextmenurequest.h>
 #include <QtWebEngineCore/qwebenginehttprequest.h>
+#include <QtWebEngineCore/qwebengineframe.h>
+#include <QtWebEngineCore/qwebenginepermission.h>
 
 #include "web_contents_adapter_client.h"
 
+#include <functional>
 #include <memory>
+#include <optional>
 
 namespace blink {
 namespace web_pref {
@@ -34,9 +40,14 @@ struct WebPreferences;
 }
 }
 
+namespace base {
+class Value;
+}
+
 namespace content {
 class WebContents;
 class SiteInstance;
+class RenderFrameHost;
 }
 
 QT_BEGIN_NAMESPACE
@@ -62,6 +73,11 @@ class WebChannelIPCTransportHost;
 
 class Q_WEBENGINECORE_EXPORT WebContentsAdapter : public QEnableSharedFromThis<WebContentsAdapter> {
 public:
+    // Sentinel to indicate that a behavior should happen on the main frame
+    static constexpr quint64 kUseMainFrameId = -2;
+    // Sentinel to indicate a frame doesn't exist, for example with `findFrameByName`
+    static constexpr quint64 kInvalidFrameId = -3;
+
     static QSharedPointer<WebContentsAdapter> createFromSerializedNavigationHistory(QDataStream &input, WebContentsAdapterClient *adapterClient);
     WebContentsAdapter();
     WebContentsAdapter(std::unique_ptr<content::WebContents> webContents);
@@ -124,8 +140,10 @@ public:
     void serializeNavigationHistory(QDataStream &output);
     void setZoomFactor(qreal);
     qreal currentZoomFactor() const;
-    void runJavaScript(const QString &javaScript, quint32 worldId);
-    quint64 runJavaScriptCallbackResult(const QString &javaScript, quint32 worldId);
+    void runJavaScript(const QString &javaScript, quint32 worldId, quint64 frameId,
+                       const std::function<void(const QVariant &)> &callback);
+    void didRunJavaScript(quint64 requestId, const base::Value &result);
+    void clearJavaScriptCallbacks();
     quint64 fetchDocumentMarkup();
     quint64 fetchDocumentInnerText();
     void updateWebPreferences(const blink::web_pref::WebPreferences &webPreferences);
@@ -161,10 +179,12 @@ public:
     void devToolsFrontendDestroyed(DevToolsFrontendQt *frontend);
     QString devToolsId();
 
-    void grantMediaAccessPermission(const QUrl &securityOrigin, WebContentsAdapterClient::MediaRequestFlags flags);
-    void grantMouseLockPermission(const QUrl &securityOrigin, bool granted);
+    void setFeaturePermission(const QUrl &origin, QWebEnginePermission::Feature feature, QWebEnginePermission::State state);
+    QWebEnginePermission::State getPermissionState(const QUrl &origin, QWebEnginePermission::Feature feature);
+
+    void grantMediaAccessPermission(const QUrl &origin, WebContentsAdapterClient::MediaRequestFlags flags);
+    void grantMouseLockPermission(const QUrl &origin, bool granted);
     void handlePendingMouseLockPermission();
-    void grantFeaturePermission(const QUrl &securityOrigin, ProfileAdapter::PermissionType feature, ProfileAdapter::PermissionState allowed);
 
     void setBackgroundColor(const QColor &color);
     QAccessibleInterface *browserAccessible();
@@ -189,10 +209,11 @@ public:
     void endDragging(QDropEvent *e, const QPointF &screenPos);
     void leaveDrag();
 #endif // QT_CONFIG(draganddrop)
-    void printToPDF(const QPageLayout&, const QPageRanges &, const QString&);
-    quint64 printToPDFCallbackResult(const QPageLayout &, const QPageRanges &,
-                                     bool colorMode = true,
-                                     bool useCustomMargins = true);
+    void printToPDF(const QPageLayout &, const QPageRanges &, const QString &, quint64 frameId);
+    void printToPDFCallbackResult(std::function<void(QSharedPointer<QByteArray>)> &&,
+                                  const QPageLayout &, const QPageRanges &, bool colorMode,
+                                  bool useCustomMargins, quint64 frameId);
+    void didPrintPage(quint64 requestId, QSharedPointer<QByteArray> result);
 
     void replaceMisspelling(const QString &word);
     void viewSource();
@@ -204,6 +225,15 @@ public:
     void resetTouchSelectionController();
     void changeTextDirection(bool leftToRight);
 
+    quint64 mainFrameId() const;
+    QString frameName(quint64 id) const;
+    QString frameHtmlName(quint64 id) const;
+    QList<quint64> frameChildren(quint64 id) const;
+    QUrl frameUrl(quint64 id) const;
+    QSizeF frameSize(quint64 id) const;
+    std::optional<quint64> findFrameIdByName(const QString &name) const;
+    bool hasFrame(quint64 id) const;
+
     // meant to be used within WebEngineCore only
     void initialize(content::SiteInstance *site);
     content::WebContents *webContents() const;
@@ -216,6 +246,7 @@ private:
     Q_DISABLE_COPY(WebContentsAdapter)
     void waitForUpdateDragActionCalled();
     bool handleDropDataFileContents(const content::DropData &dropData, QMimeData *mimeData);
+    content::RenderFrameHost *renderFrameHostFromFrameId(quint64 frameId) const;
 
     void wasShown();
     void wasHidden();
@@ -241,6 +272,8 @@ private:
     WebContentsAdapterClient *m_adapterClient;
     quint64 m_nextRequestId;
     QMap<QUrl, bool> m_pendingMouseLockPermissions;
+    QMap<quint64, std::function<void(const QVariant &)>> m_javaScriptCallbacks;
+    std::map<quint64, std::function<void(QSharedPointer<QByteArray>)>> m_printCallbacks;
     std::unique_ptr<content::DropData> m_currentDropData;
     uint m_currentDropAction;
     bool m_updateDragActionCalled;