summaryrefslogtreecommitdiffstats
path: root/src/webengine
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-12-16 12:53:30 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-23 11:09:21 +0100
commit7d39fa4acaa38dbaa1977cbff6500f338a59250c (patch)
tree11d08d555abdf904608467392112fc1a24d88ccb /src/webengine
parente78497c702447ce15369e18828bf1dc1aa073620 (diff)
createWindow QML API for QQuickWebEngineView
This implements adoptNewWindow for QQuickWebEngineView. The API is only intended to be used through QML to avoid delegating the QQuickWebEngineViewHandle ownership through a signal parameter. Another limitation of the implementation is currently to fail the handle adoption unless it is done synchronously within the adoptNewWindow call. To support this we would need to delay the call to WebContentsAdapter::initialize which will leave the adapter without a client when returning to the event loop and would require putting null checks everywhere it is used. So I would prefer to keep the API limited and avoid potential crashes. If we want to support asynchronous Loader elements or QML files fetched from the network in the future, the API should be able to scale to the task once we've adjusted the implementation. This also adds basic tabs support in the quicknanobrowser example. The url property is now set imperatively to avoid overwriting the adopted WebContentsAdapter's loading URL. Change-Id: Iba5c5dc3ffa21045f356be131ca15c01b9aee7c8 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/webengine')
-rw-r--r--src/webengine/api/qquickwebengineview.cpp84
-rw-r--r--src/webengine/api/qquickwebengineview_p_p.h16
-rw-r--r--src/webengine/render_widget_host_view_qt_delegate_quick.h1
3 files changed, 98 insertions, 3 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index e9375148..d159ed8f 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -47,6 +47,7 @@
#include <QScreen>
#include <QUrl>
+#include <QQmlEngine>
QT_BEGIN_NAMESPACE
@@ -158,9 +159,48 @@ void QQuickWebEngineViewPrivate::focusContainer()
void QQuickWebEngineViewPrivate::adoptNewWindow(WebContentsAdapter *newWebContents, WindowOpenDisposition disposition, const QRect &)
{
- Q_UNUSED(newWebContents);
- Q_UNUSED(disposition);
- Q_UNREACHABLE();
+ Q_Q(QQuickWebEngineView);
+ QQmlEngine *engine = QtQml::qmlEngine(q);
+ // This is currently only supported for QML instantiated WebEngineViews.
+ // We could emit a QObject* and set JavaScriptOwnership explicitly on it
+ // but this would make the signal cumbersome to use in C++ where one, and
+ // only one, of the connected slots would have to destroy the given handle.
+ // A virtual method instead of a signal would work better in this case.
+ if (!engine)
+ return;
+ static const QMetaMethod createWindowSignal = QMetaMethod::fromSignal(&QQuickWebEngineViewExperimental::createWindow);
+ if (!e->isSignalConnected(createWindowSignal))
+ return;
+
+ QQuickWebEngineViewHandle *handle = new QQuickWebEngineViewHandle;
+ // This increases the ref-count of newWebContents and will tell Chromium
+ // to start loading it and possibly return it to its parent page window.open().
+ handle->adapter = newWebContents;
+ // Clearly mark our wrapper as owned by JavaScript, we then depend on it
+ // being adopted or else eventually cleaned up by the GC.
+ QJSValue jsHandle = engine->newQObject(handle);
+
+ QString dispositionString;
+ switch (disposition) {
+ case WebContentsAdapterClient::NewForegroundTabDisposition:
+ case WebContentsAdapterClient::NewBackgroundTabDisposition:
+ dispositionString = QStringLiteral("tab");
+ break;
+ case WebContentsAdapterClient::NewPopupDisposition:
+ dispositionString = QStringLiteral("popup");
+ break;
+ case WebContentsAdapterClient::NewWindowDisposition:
+ dispositionString = QStringLiteral("window");
+ break;
+ default:
+ Q_UNREACHABLE();
+ }
+
+ emit e->createWindow(jsHandle, dispositionString);
+
+ // We currently require the adoption to happen within the signal handler to avoid having
+ // to support a null WebContentsAdapterClient for too long after having returned.
+ handle->adapter.reset();
}
void QQuickWebEngineViewPrivate::close()
@@ -285,6 +325,14 @@ void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRect
}
}
+QQuickWebEngineViewHandle::QQuickWebEngineViewHandle()
+{
+}
+
+QQuickWebEngineViewHandle::~QQuickWebEngineViewHandle()
+{
+}
+
QQuickWebEngineViewExperimental::QQuickWebEngineViewExperimental(QQuickWebEngineViewPrivate *viewPrivate)
: q_ptr(0)
, d_ptr(viewPrivate)
@@ -320,4 +368,34 @@ void QQuickWebEngineViewport::setDevicePixelRatio(qreal devicePixelRatio)
Q_EMIT devicePixelRatioChanged();
}
+void QQuickWebEngineViewExperimental::adoptHandle(QQuickWebEngineViewHandle *viewHandle)
+{
+ if (!viewHandle || !viewHandle->adapter) {
+ qWarning("Trying to adopt an empty handle, it was either already adopted or was invalidated."
+ "\nYou must do the adoption synchronously within the createWindow signal handler."
+ " If the handle hasn't been adopted before returning, it will be invalidated.");
+ return;
+ }
+
+ Q_Q(QQuickWebEngineView);
+ Q_D(QQuickWebEngineView);
+
+ // This throws away the WebContentsAdapter that has been used until now.
+ // All its states, particularly the loading URL, are replaced by the adopted WebContentsAdapter.
+ d->adapter = viewHandle->adapter;
+ viewHandle->adapter.reset();
+
+ d->adapter->initialize(d);
+
+ // Emit signals for values that might be different from the previous WebContentsAdapter.
+ emit q->titleChanged();
+ emit q->urlChanged();
+ emit q->iconChanged();
+ emit q->loadingStateChanged();
+ emit q->loadProgressChanged();
+}
+
QT_END_NAMESPACE
+
+#include "moc_qquickwebengineview_p.cpp"
+#include "moc_qquickwebengineview_p_p.cpp"
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index b356b888..0af1dcb4 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -71,11 +71,27 @@ private:
Q_DECLARE_PRIVATE(QQuickWebEngineView)
};
+class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewHandle : public QObject {
+ Q_OBJECT
+public:
+ QQuickWebEngineViewHandle();
+ ~QQuickWebEngineViewHandle();
+
+private:
+ QExplicitlySharedDataPointer<WebContentsAdapter> adapter;
+ friend class QQuickWebEngineViewExperimental;
+ friend class QQuickWebEngineViewPrivate;
+};
+
class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewExperimental : public QObject {
Q_OBJECT
Q_PROPERTY(QQuickWebEngineViewport *viewport READ viewport)
public:
QQuickWebEngineViewport *viewport() const;
+ Q_INVOKABLE void adoptHandle(QQuickWebEngineViewHandle *viewHandle);
+
+Q_SIGNALS:
+ void createWindow(const QJSValue &newViewHandle, const QString &newViewDisposition);
private:
QQuickWebEngineViewExperimental(QQuickWebEngineViewPrivate* viewPrivate);
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h
index e8e073c2..b31a9c87 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h
@@ -68,6 +68,7 @@ public:
{
QQuickWebEngineViewPrivate *viewPrivate = static_cast<QQuickWebEngineViewPrivate *>(container);
this->setParentItem(viewPrivate->q_func());
+ this->setSize(viewPrivate->q_func()->boundingRect().size());
}
virtual void initAsPopup(const QRect& rect) Q_DECL_OVERRIDE