3 files changed, 35 insertions, 3 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index ad850e84e..3a6b8cb21 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -37,6 +37,7 @@
 #include "qquickwebengineview_p.h"
 #include "qquickwebengineview_p_p.h"
 
+#include "browser_context_adapter.h"
 #include "certificate_error_controller.h"
 #include "javascript_dialog_controller.h"
 #include "qquickwebenginehistory_p.h"
@@ -343,9 +344,11 @@ void QQuickWebEngineViewPrivate::adoptNewWindow(WebContentsAdapter *newWebConten
 
     switch (disposition) {
     case WebContentsAdapterClient::NewForegroundTabDisposition:
-    case WebContentsAdapterClient::NewBackgroundTabDisposition:
         request.m_destination = QQuickWebEngineView::NewViewInTab;
         break;
+    case WebContentsAdapterClient::NewBackgroundTabDisposition:
+        request.m_destination = QQuickWebEngineView::NewViewInBackgroundTab;
+        break;
     case WebContentsAdapterClient::NewPopupDisposition:
         request.m_destination = QQuickWebEngineView::NewViewInDialog;
         break;
@@ -356,7 +359,7 @@ void QQuickWebEngineViewPrivate::adoptNewWindow(WebContentsAdapter *newWebConten
         Q_UNREACHABLE();
     }
 
-    emit e->newViewRequested(&request);
+    Q_EMIT e->newViewRequested(&request);
 }
 
 void QQuickWebEngineViewPrivate::close()
@@ -401,6 +404,11 @@ QObject *QQuickWebEngineViewPrivate::accessibilityParentObject()
     return q;
 }
 
+BrowserContextAdapter *QQuickWebEngineViewPrivate::browserContextAdapter()
+{
+    return BrowserContextAdapter::defaultContext();
+}
+
 WebEngineSettings *QQuickWebEngineViewPrivate::webEngineSettings() const
 {
     return m_settings->d_func()->coreSettings.data();
@@ -557,6 +565,17 @@ void QQuickWebEngineView::stop()
     d->adapter->stop();
 }
 
+void QQuickWebEngineView::setZoomFactor(qreal arg)
+{
+    Q_D(QQuickWebEngineView);
+    qreal oldFactor = d->adapter->currentZoomFactor();
+    d->adapter->setZoomFactor(arg);
+    if (qFuzzyCompare(oldFactor, d->adapter->currentZoomFactor()))
+        return;
+
+    emit zoomFactorChanged(arg);
+}
+
 void QQuickWebEngineViewPrivate::didRunJavaScript(quint64 requestId, const QVariant &result)
 {
     Q_Q(QQuickWebEngineView);
@@ -620,6 +639,12 @@ QQuickWebEngineViewExperimental *QQuickWebEngineView::experimental() const
     return d->e.data();
 }
 
+qreal QQuickWebEngineView::zoomFactor() const
+{
+    Q_D(const QQuickWebEngineView);
+    return d->adapter->currentZoomFactor();
+}
+
 bool QQuickWebEngineViewExperimental::inspectable() const
 {
     Q_D(const QQuickWebEngineView);
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 22713ee22..9f6493022 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -56,6 +56,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(bool canGoBack READ canGoBack NOTIFY urlChanged)
     Q_PROPERTY(bool canGoForward READ canGoForward NOTIFY urlChanged)
+    Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
     Q_ENUMS(NavigationRequestAction);
     Q_ENUMS(NavigationType);
     Q_ENUMS(LoadStatus);
@@ -75,6 +76,7 @@ public:
     QString title() const;
     bool canGoBack() const;
     bool canGoForward() const;
+    qreal zoomFactor() const;
 
     QQuickWebEngineViewExperimental *experimental() const;
 
@@ -116,7 +118,8 @@ public:
     enum NewViewDestination {
         NewViewInWindow,
         NewViewInTab,
-        NewViewInDialog
+        NewViewInDialog,
+        NewViewInBackgroundTab
     };
 
     // must match WebContentsAdapterClient::JavaScriptConsoleMessageLevel
@@ -133,6 +136,7 @@ public Q_SLOTS:
     void goForward();
     void reload();
     void stop();
+    void setZoomFactor(qreal arg);
 
 Q_SIGNALS:
     void titleChanged();
@@ -143,6 +147,7 @@ Q_SIGNALS:
     void linkHovered(const QUrl &hoveredUrl);
     void navigationRequested(QQuickWebEngineNavigationRequest *request);
     void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID);
+    void zoomFactorChanged(qreal arg);
 
 protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index 6662f1f02..c7ea6575e 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -179,6 +179,8 @@ public:
     virtual WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE;
     virtual void allowCertificateError(const QExplicitlySharedDataPointer<CertificateErrorController> &errorController);
 
+    virtual BrowserContextAdapter *browserContextAdapter() Q_DECL_OVERRIDE;
+
     void setDevicePixelRatio(qreal);
     void adoptWebContents(WebContentsAdapter *webContents);