summaryrefslogtreecommitdiffstats
path: root/src/webenginequick/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/webenginequick/api')
-rw-r--r--src/webenginequick/api/qquickwebengineview.cpp57
-rw-r--r--src/webenginequick/api/qquickwebengineview_p.h13
-rw-r--r--src/webenginequick/api/qquickwebengineview_p_p.h18
3 files changed, 4 insertions, 84 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp
index e26d5cf25..0f3adca92 100644
--- a/src/webenginequick/api/qquickwebengineview.cpp
+++ b/src/webenginequick/api/qquickwebengineview.cpp
@@ -99,11 +99,6 @@
#include <QtWebChannel/qqmlwebchannel.h>
#endif
-#if QT_CONFIG(webenginequick_testsupport)
-#include <QtWebEngineTestSupport/private/qquickwebenginetestsupport_p.h>
-#endif
-
-
QT_BEGIN_NAMESPACE
using namespace QtWebEngineCore;
@@ -138,9 +133,6 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
, m_history(new QWebEngineHistory(new QWebEngineHistoryPrivate(this, [] (const QUrl &url) {
return QQuickWebEngineFaviconProvider::faviconProviderUrl(url);
})))
-#if QT_CONFIG(webenginequick_testsupport)
- , m_testSupport(nullptr)
-#endif
, contextMenuExtraItems(nullptr)
, loadProgress(0)
, m_fullscreenMode(false)
@@ -453,32 +445,6 @@ void QQuickWebEngineViewPrivate::loadCommitted()
m_history->reset();
}
-void QQuickWebEngineViewPrivate::didFirstVisuallyNonEmptyPaint()
-{
-#if QT_CONFIG(webenginequick_testsupport)
- if (m_loadVisuallyCommittedState == NotCommitted) {
- m_loadVisuallyCommittedState = DidFirstVisuallyNonEmptyPaint;
- } else if (m_loadVisuallyCommittedState == DidFirstCompositorFrameSwap) {
- if (m_testSupport)
- Q_EMIT m_testSupport->loadVisuallyCommitted();
- m_loadVisuallyCommittedState = NotCommitted;
- }
-#endif
-}
-
-void QQuickWebEngineViewPrivate::didCompositorFrameSwap()
-{
-#if QT_CONFIG(webenginequick_testsupport)
- if (m_loadVisuallyCommittedState == NotCommitted) {
- m_loadVisuallyCommittedState = DidFirstCompositorFrameSwap;
- } else if (m_loadVisuallyCommittedState == DidFirstVisuallyNonEmptyPaint) {
- if (m_testSupport)
- Q_EMIT m_testSupport->loadVisuallyCommitted();
- m_loadVisuallyCommittedState = NotCommitted;
- }
-#endif
-}
-
void QQuickWebEngineViewPrivate::loadFinished(QWebEngineLoadingInfo info)
{
Q_Q(QQuickWebEngineView);
@@ -552,10 +518,10 @@ void QQuickWebEngineViewPrivate::close()
void QQuickWebEngineViewPrivate::windowCloseRejected()
{
-#if QT_CONFIG(webenginequick_testsupport)
- if (m_testSupport)
- Q_EMIT m_testSupport->windowCloseRejected();
-#endif
+ Q_Q(QQuickWebEngineView);
+
+ if (Q_UNLIKELY(q->metaObject()->indexOfMethod("windowCloseRejected()") != -1))
+ QMetaObject::invokeMethod(q, "windowCloseRejected");
}
void QQuickWebEngineViewPrivate::requestFullScreenMode(const QUrl &origin, bool fullscreen)
@@ -1168,21 +1134,6 @@ void QQuickWebEngineViewPrivate::updateAdapter()
}
}
-#if QT_CONFIG(webenginequick_testsupport)
-QQuickWebEngineTestSupport *QQuickWebEngineView::testSupport() const
-{
- Q_D(const QQuickWebEngineView);
- return d->m_testSupport;
-}
-
-void QQuickWebEngineView::setTestSupport(QQuickWebEngineTestSupport *testSupport)
-{
- Q_D(QQuickWebEngineView);
- d->m_testSupport = testSupport;
- Q_EMIT testSupportChanged();
-}
-#endif
-
bool QQuickWebEngineView::activeFocusOnPress() const
{
Q_D(const QQuickWebEngineView);
diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h
index 2e3252777..ab891f4e2 100644
--- a/src/webenginequick/api/qquickwebengineview_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p.h
@@ -74,7 +74,6 @@ class QQuickWebEngineJavaScriptDialogRequest;
class QQuickWebEngineNewViewRequest;
class QQuickWebEngineProfile;
class QQuickWebEngineSettings;
-class QQuickWebEngineTestSupport;
class QQuickWebEngineTooltipRequest;
class QQuickWebEngineViewPrivate;
class QWebEngineCertificateError;
@@ -118,9 +117,6 @@ class Q_WEBENGINEQUICK_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
Q_PROPERTY(QQuickWebEngineView *inspectedView READ inspectedView WRITE setInspectedView NOTIFY inspectedViewChanged REVISION(1,7) FINAL)
Q_PROPERTY(QQuickWebEngineView *devToolsView READ devToolsView WRITE setDevToolsView NOTIFY devToolsViewChanged REVISION(1,7) FINAL)
-#if QT_CONFIG(webenginequick_testsupport)
- Q_PROPERTY(QQuickWebEngineTestSupport *testSupport READ testSupport WRITE setTestSupport NOTIFY testSupportChanged FINAL)
-#endif
Q_PROPERTY(LifecycleState lifecycleState READ lifecycleState WRITE setLifecycleState NOTIFY lifecycleStateChanged REVISION(1,10) FINAL)
Q_PROPERTY(LifecycleState recommendedState READ recommendedState NOTIFY recommendedStateChanged REVISION(1,10) FINAL)
@@ -456,11 +452,6 @@ public:
qint64 renderProcessPid() const;
-#if QT_CONFIG(webenginequick_testsupport)
- QQuickWebEngineTestSupport *testSupport() const;
- void setTestSupport(QQuickWebEngineTestSupport *testSupport);
-#endif
-
bool activeFocusOnPress() const;
void setInspectedView(QQuickWebEngineView *);
@@ -542,10 +533,6 @@ Q_SIGNALS:
Q_REVISION(1,11) void canGoBackChanged();
Q_REVISION(1,11) void canGoForwardChanged();
-#if QT_CONFIG(webenginequick_testsupport)
- void testSupportChanged();
-#endif
-
protected:
void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
void itemChange(ItemChange, const ItemChangeData &) override;
diff --git a/src/webenginequick/api/qquickwebengineview_p_p.h b/src/webenginequick/api/qquickwebengineview_p_p.h
index 4f07ce909..da0d79d60 100644
--- a/src/webenginequick/api/qquickwebengineview_p_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p_p.h
@@ -80,10 +80,6 @@ class QWebEngineContextMenuRequest;
class QWebEngineFindTextResult;
class QWebEngineHistory;
-#if QT_CONFIG(webenginequick_testsupport)
-class QQuickWebEngineTestSupport;
-#endif
-
class Q_WEBENGINEQUICK_PRIVATE_EXPORT QQuickWebEngineViewPrivate : public QtWebEngineCore::WebContentsAdapterClient
{
public:
@@ -113,7 +109,6 @@ public:
QColor backgroundColor() const override;
void loadStarted(QWebEngineLoadingInfo info) override;
void loadCommitted() override;
- void didFirstVisuallyNonEmptyPaint() override;
void loadFinished(QWebEngineLoadingInfo info) override;
void focusContainer() override;
void unhandledKeyEvent(QKeyEvent *event) override;
@@ -168,9 +163,6 @@ public:
QtWebEngineCore::WebContentsAdapter *webContentsAdapter() override;
void printRequested() override;
void findTextFinished(const QWebEngineFindTextResult &result) override;
-
- void didCompositorFrameSwap();
-
void updateAction(QQuickWebEngineView::WebAction) const;
void adoptWebContents(QtWebEngineCore::WebContentsAdapter *webContents);
void setProfile(QQuickWebEngineProfile *profile);
@@ -186,9 +178,6 @@ public:
QSharedPointer<QtWebEngineCore::WebContentsAdapter> adapter;
QScopedPointer<QWebEngineHistory> m_history;
QScopedPointer<QQuickWebEngineSettings> m_settings;
-#if QT_CONFIG(webenginequick_testsupport)
- QQuickWebEngineTestSupport *m_testSupport;
-#endif
QQmlComponent *contextMenuExtraItems;
QUrl m_url;
QString m_html;
@@ -212,18 +201,11 @@ public:
bool profileInitialized() const;
private:
- enum LoadVisuallyCommittedState {
- NotCommitted,
- DidFirstVisuallyNonEmptyPaint,
- DidFirstCompositorFrameSwap
- };
-
QScopedPointer<QtWebEngineCore::UIDelegatesManager> m_uIDelegatesManager;
QColor m_backgroundColor;
qreal m_zoomFactor;
bool m_profileInitialized;
QWebEngineContextMenuRequest *m_contextMenuRequest;
- LoadVisuallyCommittedState m_loadVisuallyCommittedState = NotCommitted;
QScopedPointer<QQuickWebEngineScriptCollection> m_scriptCollection;
QQuickWebEngineFaviconProvider *m_faviconProvider = nullptr;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 16:26:52 +0000