1 files changed, 73 insertions, 4 deletions

diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index f85bf64ad..ddc656a58 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -71,19 +71,25 @@ class QQuickWebEngineTestSupport;
 
 class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineFullScreenRequest {
     Q_GADGET
+    Q_PROPERTY(QUrl origin READ origin)
     Q_PROPERTY(bool toggleOn READ toggleOn)
 public:
     QQuickWebEngineFullScreenRequest();
-    QQuickWebEngineFullScreenRequest(QQuickWebEngineViewPrivate *viewPrivate, bool toggleOn);
+    QQuickWebEngineFullScreenRequest(QQuickWebEngineViewPrivate *viewPrivate, const QUrl &origin, bool toggleOn);
 
     Q_INVOKABLE void accept();
-    bool toggleOn() { return m_toggleOn; }
+    Q_INVOKABLE void reject();
+    QUrl origin() const { return m_origin; }
+    bool toggleOn() const { return m_toggleOn; }
 
 private:
     QQuickWebEngineViewPrivate *viewPrivate;
-    bool m_toggleOn;
+    const QUrl m_origin;
+    const bool m_toggleOn;
 };
 
+#define LATEST_WEBENGINEVIEW_REVISION 2
+
 class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
     Q_OBJECT
     Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
@@ -100,6 +106,8 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
     Q_PROPERTY(QQuickWebEngineHistory *navigationHistory READ navigationHistory CONSTANT FINAL REVISION 1)
     Q_PROPERTY(QQmlWebChannel *webChannel READ webChannel WRITE setWebChannel NOTIFY webChannelChanged REVISION 1)
     Q_PROPERTY(QQmlListProperty<QQuickWebEngineScript> userScripts READ userScripts FINAL REVISION 1)
+    Q_PROPERTY(bool activeFocusOnPress READ activeFocusOnPress WRITE setActiveFocusOnPress NOTIFY activeFocusOnPressChanged REVISION 2)
+    Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged REVISION 2)
 
 #ifdef ENABLE_QML_TESTSUPPORT_API
     Q_PROPERTY(QQuickWebEngineTestSupport *testSupport READ testSupport WRITE setTestSupport FINAL)
@@ -112,7 +120,9 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
     Q_ENUMS(NewViewDestination);
     Q_ENUMS(Feature);
     Q_ENUMS(JavaScriptConsoleMessageLevel);
+    Q_ENUMS(RenderProcessTerminationStatus);
     Q_FLAGS(FindFlags);
+    Q_ENUMS(WebAction);
 
 public:
     QQuickWebEngineView(QQuickItem *parent = 0);
@@ -129,6 +139,8 @@ public:
     bool isFullScreen() const;
     qreal zoomFactor() const;
     void setZoomFactor(qreal arg);
+    QColor backgroundColor() const;
+    void setBackgroundColor(const QColor &color);
 
     QQuickWebEngineViewExperimental *experimental() const;
 
@@ -181,6 +193,48 @@ public:
         Geolocation
     };
 
+    enum WebAction {
+        NoWebAction = - 1,
+        Back,
+        Forward,
+        Stop,
+        Reload,
+
+        Cut,
+        Copy,
+        Paste,
+
+        Undo,
+        Redo,
+        SelectAll,
+        ReloadAndBypassCache,
+
+        PasteAndMatchStyle,
+
+        OpenLinkInThisWindow,
+        OpenLinkInNewWindow,
+        OpenLinkInNewTab,
+        CopyLinkToClipboard,
+        DownloadLinkToDisk,
+
+        CopyImageToClipboard,
+        CopyImageUrlToClipboard,
+        DownloadImageToDisk,
+
+        CopyMediaUrlToClipboard,
+        ToggleMediaControls,
+        ToggleMediaLoop,
+        ToggleMediaPlayPause,
+        ToggleMediaMute,
+        DownloadMediaToDisk,
+
+        InspectElement,
+        ExitFullScreen,
+        RequestClose,
+
+        WebActionCount
+    };
+
     // must match WebContentsAdapterClient::JavaScriptConsoleMessageLevel
     enum JavaScriptConsoleMessageLevel {
         InfoMessageLevel = 0,
@@ -188,6 +242,14 @@ public:
         ErrorMessageLevel
     };
 
+    // must match WebContentsAdapterClient::RenderProcessTerminationStatus
+    enum RenderProcessTerminationStatus {
+        NormalTerminationStatus = 0,
+        AbnormalTerminationStatus,
+        CrashedTerminationStatus,
+        KilledTerminationStatus
+    };
+
     enum FindFlag {
         FindBackward = 1,
         FindCaseSensitively = 2,
@@ -211,6 +273,8 @@ public:
     void setTestSupport(QQuickWebEngineTestSupport *testSupport);
 #endif
 
+    bool activeFocusOnPress() const;
+
 public Q_SLOTS:
     void runJavaScript(const QString&, const QJSValue & = QJSValue());
     void loadHtml(const QString &html, const QUrl &baseUrl = QUrl());
@@ -223,6 +287,8 @@ public Q_SLOTS:
     Q_REVISION(1) void findText(const QString &subString, FindFlags options = 0, const QJSValue &callback = QJSValue());
     Q_REVISION(1) void fullScreenCancelled();
     Q_REVISION(1) void grantFeaturePermission(const QUrl &securityOrigin, Feature, bool granted);
+    Q_REVISION(2) void setActiveFocusOnPress(bool arg);
+    Q_REVISION(2) void triggerWebAction(WebAction action);
 
 Q_SIGNALS:
     void titleChanged();
@@ -241,7 +307,10 @@ Q_SIGNALS:
     Q_REVISION(1) void zoomFactorChanged(qreal arg);
     Q_REVISION(1) void profileChanged();
     Q_REVISION(1) void webChannelChanged();
-
+    Q_REVISION(2) void activeFocusOnPressChanged(bool);
+    Q_REVISION(2) void backgroundColorChanged();
+    Q_REVISION(2) void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode);
+    Q_REVISION(2) void windowCloseRequested();
 
 protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);