From 7753f12a5449a3ec934e833619380e91f97a6db1 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Tue, 14 Jan 2014 15:56:06 +0100 Subject: Pre-start the render process upon initialiazing the adapter This should provide us with an initial empty document, which our imported autotests tend to assume all over the place. Initialization of the adapter is moved further down in QQuickWebEngineView's constructor so that the value of q_ptr is set and valid by the time we end up in WebContentsViewQt::CreateViewForWidget. Change-Id: I45d8d61e65caa3a690461b6da44adea9f8981e7e Reviewed-by: Jocelyn Turcotte Reviewed-by: Zeno Albisser Reviewed-by: Andras Becsi --- src/webengine/api/qquickwebengineview.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index a99707730..68e64ee4e 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -89,8 +89,6 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate() // 1x, 2x, 3x etc assets that fit an integral number of pixels. setDevicePixelRatio(qMax(1, qRound(webPixelRatio))); } - - adapter->initialize(this); } QQuickWebEngineViewExperimental *QQuickWebEngineViewPrivate::experimental() const @@ -324,8 +322,9 @@ void QQuickWebEngineViewPrivate::setDevicePixelRatio(qreal devicePixelRatio) QQuickWebEngineView::QQuickWebEngineView(QQuickItem *parent) : QQuickItem(*(new QQuickWebEngineViewPrivate), parent) { - Q_D(const QQuickWebEngineView); + Q_D(QQuickWebEngineView); d->e->q_ptr = this; + d->adapter->initialize(d); } QQuickWebEngineView::~QQuickWebEngineView() -- cgit v1.2.3