Replace testsupport's QQuickWebEngineErrorPage with isErrorPage

Merge and unify handling of loading started/finished for quick
and widgets by removing separate quick's type for monitoring
error page load and replace it with an isErrorPage method
in WebEngineLoadRequest to indicate, that load ended with an error
page being displayed. Effectively this only slightly changes when
loading finished gets emitted: now the signal is just postponed until
error page is finished loading after initial failure.

[ChangeLog][QWebEngineQuick][WebEngineLoadingInfo] New property
'isErrorPage' which indicates that the load resulted in an error page

Change-Id: I3e59dc488429d776f7c8e083b6d0489fb30a65fc
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 12 insertions, 3 deletions

diff --git a/src/core/api/qwebengineloadinginfo.h b/src/core/api/qwebengineloadinginfo.h
index bd07d52a3..8aacb0281 100644
--- a/src/core/api/qwebengineloadinginfo.h
+++ b/src/core/api/qwebengineloadinginfo.h
@@ -45,12 +45,18 @@
 #include <QObject>
 #include <QUrl>
 
+namespace QtWebEngineCore {
+class WebContentsAdapter;
+class WebContentsDelegateQt;
+}
+
 QT_BEGIN_NAMESPACE
 
 class Q_WEBENGINECORE_EXPORT QWebEngineLoadingInfo
 {
     Q_GADGET
     Q_PROPERTY(QUrl url READ url CONSTANT FINAL)
+    Q_PROPERTY(bool isErrorPage READ isErrorPage CONSTANT FINAL)
     Q_PROPERTY(LoadStatus status READ status CONSTANT FINAL)
     Q_PROPERTY(QString errorString READ errorString CONSTANT FINAL)
     Q_PROPERTY(ErrorDomain errorDomain READ errorDomain CONSTANT FINAL)
@@ -83,19 +89,22 @@ public:
     ~QWebEngineLoadingInfo();
 
     QUrl url() const;
+    bool isErrorPage() const;
     LoadStatus status() const;
     QString errorString() const;
     ErrorDomain errorDomain() const;
     int errorCode() const;
 
 private:
-    QWebEngineLoadingInfo(const QUrl& url, LoadStatus status, const QString& errorString = QString(),
-                       int errorCode = 0, ErrorDomain errorDomain = NoErrorDomain);
+    QWebEngineLoadingInfo(const QUrl& url, LoadStatus status,
+                          bool isErrorPage = false, const QString& errorString = QString(),
+                          int errorCode = 0, ErrorDomain errorDomain = NoErrorDomain);
     class QWebEngineLoadingInfoPrivate;
     Q_DECLARE_PRIVATE(QWebEngineLoadingInfo)
     QExplicitlySharedDataPointer<QWebEngineLoadingInfoPrivate> d_ptr;
     friend class QQuickWebEngineViewPrivate;
-    friend class QQuickWebEngineErrorPage;
+    friend class QtWebEngineCore::WebContentsAdapter;
+    friend class QtWebEngineCore::WebContentsDelegateQt;
 };
 
 QT_END_NAMESPACE