diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-07-25 08:40:54 -0700 |
|---|---|---|
| committer | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-08-01 09:59:37 +0200 |
| commit | 2781345715338669e2573fb0c05efe5656ca37d8 (patch) | |
| tree | b55dd9e07f5d868500a3ec3ab1ddb0b69174f784 /src/webengine | |
| parent | a2a8ded66e33db0313194bd23c7337f106c2140e (diff) | |
Add loadVisuallyCommitted signal to the experimental Quick API
This fixes the flaky QQuickWebEngineViewGraphics test and extends it
with a new test case.
Change-Id: I2d8a0762716cb9232fdea6473760e67ac2e7146d
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 11 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 3 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index b71dbfd06..559057b94 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -278,6 +278,11 @@ void QQuickWebEngineViewPrivate::loadCommitted() m_history->reset(); } +void QQuickWebEngineViewPrivate::loadVisuallyCommitted() +{ + Q_EMIT e->loadVisuallyCommitted(); +} + void QQuickWebEngineViewPrivate::loadFinished(bool success, int error_code, const QString &error_description) { Q_Q(QQuickWebEngineView); @@ -575,6 +580,12 @@ void QQuickWebEngineView::forceActiveFocus() } } +QQuickWebEngineViewExperimental *QQuickWebEngineView::experimental() const +{ + Q_D(const QQuickWebEngineView); + return d->e.data(); +} + 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 fd783eb84..ca2574e0e 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE +class QQuickWebEngineViewExperimental; class QQuickWebEngineViewPrivate; class QQuickWebEngineLoadRequest; @@ -78,6 +79,8 @@ public: bool canGoForward() const; void forceActiveFocus(); + QQuickWebEngineViewExperimental *experimental() const; + enum LoadStatus { LoadStartedStatus, LoadStoppedStatus, diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index 299d7b0a5..e4a315d1a 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -117,6 +117,7 @@ Q_SIGNALS: void isFullScreenChanged(); void extraContextMenuEntriesComponentChanged(); void featurePermissionRequested(const QUrl &securityOrigin, Feature feature); + void loadVisuallyCommitted(); private: QQuickWebEngineViewExperimental(QQuickWebEngineViewPrivate* viewPrivate); @@ -151,6 +152,7 @@ public: virtual qreal dpiScale() const Q_DECL_OVERRIDE; virtual void loadStarted(const QUrl &provisionalUrl) Q_DECL_OVERRIDE; virtual void loadCommitted() Q_DECL_OVERRIDE; + virtual void loadVisuallyCommitted() Q_DECL_OVERRIDE; virtual void loadFinished(bool success, int error_code = 0, const QString &error_description = QString()) Q_DECL_OVERRIDE; virtual void focusContainer() Q_DECL_OVERRIDE; virtual void adoptNewWindow(WebContentsAdapter *newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &) Q_DECL_OVERRIDE; |