7 files changed, 172 insertions, 38 deletions

diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.cpp b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
index f04b73615..a61d98f94 100644
--- a/src/webenginewidgets/api/qwebenginecertificateerror.cpp
+++ b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
@@ -39,6 +39,8 @@
 
 #include "qwebenginecertificateerror.h"
 
+#include "certificate_error_controller.h"
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -51,14 +53,38 @@ QT_BEGIN_NAMESPACE
     QWebEnginePage::certificateError().
 */
 
-class QWebEngineCertificateErrorPrivate {
+class QWebEngineCertificateErrorPrivate : public QSharedData {
 public:
     QWebEngineCertificateErrorPrivate(int error, QUrl url, bool overridable, QString errorDescription);
 
+    ~QWebEngineCertificateErrorPrivate() {
+        if (deferred && !answered)
+            rejectCertificate();
+    }
+
+    void resolveError(bool accept) {
+        if (answered)
+            return;
+        answered = true;
+        if (overridable) {
+            if (auto ctl = controller.lock())
+                ctl->accept(accept);
+        }
+    }
+
+    void ignoreCertificateError() { resolveError(true); }
+    void rejectCertificate() { resolveError(false); }
+
     QWebEngineCertificateError::Error error;
     QUrl url;
     bool overridable;
     QString errorDescription;
+    QList<QSslCertificate> chain;
+
+    bool answered = false, deferred = false;
+    QWeakPointer<CertificateErrorController> controller;
+
+    Q_DISABLE_COPY(QWebEngineCertificateErrorPrivate)
 };
 
 QWebEngineCertificateErrorPrivate::QWebEngineCertificateErrorPrivate(int error, QUrl url, bool overridable, QString errorDescription)
@@ -68,17 +94,31 @@ QWebEngineCertificateErrorPrivate::QWebEngineCertificateErrorPrivate(int error,
     , errorDescription(errorDescription)
 { }
 
-
 /*! \internal
 */
 QWebEngineCertificateError::QWebEngineCertificateError(int error, QUrl url, bool overridable, QString errorDescription)
-    : d_ptr(new QWebEngineCertificateErrorPrivate(error, url, overridable, errorDescription))
+    : d(new QWebEngineCertificateErrorPrivate(error, url, overridable, errorDescription))
 { }
 
 /*! \internal
 */
+QWebEngineCertificateError::QWebEngineCertificateError(const QSharedPointer<CertificateErrorController> &controller)
+    : d(new QWebEngineCertificateErrorPrivate(controller->error(), controller->url(),
+                                              controller->overridable(), controller->errorString()))
+{
+    d->controller = controller;
+    d->chain = controller->chain();
+}
+
+QWebEngineCertificateError::QWebEngineCertificateError(const QWebEngineCertificateError &other) = default;
+
+QWebEngineCertificateError& QWebEngineCertificateError::operator=(const QWebEngineCertificateError &other) = default;
+
+/*! \internal
+*/
 QWebEngineCertificateError::~QWebEngineCertificateError()
 {
+
 }
 
 /*!
@@ -116,7 +156,6 @@ QWebEngineCertificateError::~QWebEngineCertificateError()
 */
 bool QWebEngineCertificateError::isOverridable() const
 {
-    const Q_D(QWebEngineCertificateError);
     return d->overridable;
 }
 
@@ -127,7 +166,6 @@ bool QWebEngineCertificateError::isOverridable() const
 */
 QUrl QWebEngineCertificateError::url() const
 {
-    const Q_D(QWebEngineCertificateError);
     return d->url;
 }
 
@@ -138,7 +176,6 @@ QUrl QWebEngineCertificateError::url() const
 */
 QWebEngineCertificateError::Error QWebEngineCertificateError::error() const
 {
-    const Q_D(QWebEngineCertificateError);
     return d->error;
 }
 
@@ -149,8 +186,66 @@ QWebEngineCertificateError::Error QWebEngineCertificateError::error() const
 */
 QString QWebEngineCertificateError::errorDescription() const
 {
-    const Q_D(QWebEngineCertificateError);
     return d->errorDescription;
 }
 
+/*!
+    Marks the certificate error for delayed handling.
+
+    This function should be called when there is a need to postpone the decision whether to ignore a
+    certificate error, for example, while waiting for user input. When called, the function pauses the
+    URL request until ignoreCertificateError() or rejectCertificate() is called.
+
+    \note It is only possible to defer overridable certificate errors.
+
+    \sa isOverridable(), deferred()
+*/
+void QWebEngineCertificateError::defer()
+{
+    if (isOverridable())
+        d->deferred = true;
+}
+
+/*!
+    Returns whether the decision for error handling was delayed and the URL load was halted.
+*/
+bool QWebEngineCertificateError::deferred() const
+{
+    return d->deferred;
+}
+
+/*!
+    Ignores the certificate error and continues the loading of the requested URL.
+*/
+void QWebEngineCertificateError::ignoreCertificateError()
+{
+    d->ignoreCertificateError();
+}
+
+/*!
+    Rejects the certificate and aborts the loading of the requested URL.
+*/
+void QWebEngineCertificateError::rejectCertificate()
+{
+    d->rejectCertificate();
+}
+
+/*!
+    Returns \c true if the error was explicitly rejected or accepted.
+*/
+bool QWebEngineCertificateError::answered() const
+{
+    return d->answered;
+}
+
+/*!
+    Returns the peer's chain of digital certificates
+
+    Chain starts with the peer's immediate certificate and ending with the CA's certificate.
+*/
+QList<QSslCertificate> QWebEngineCertificateError::chain() const
+{
+    return d->chain;
+}
+
 QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.h b/src/webenginewidgets/api/qwebenginecertificateerror.h
index 82ac281be..b2dd65a9f 100644
--- a/src/webenginewidgets/api/qwebenginecertificateerror.h
+++ b/src/webenginewidgets/api/qwebenginecertificateerror.h
@@ -42,11 +42,13 @@
 
 #include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
 
-#include <QtCore/qscopedpointer.h>
+#include <QtCore/qsharedpointer.h>
 #include <QtCore/qurl.h>
+#include <QtNetwork/QSslCertificate>
 
 QT_BEGIN_NAMESPACE
 
+class CertificateErrorController;
 class QWebEngineCertificateErrorPrivate;
 
 class QWEBENGINEWIDGETS_EXPORT QWebEngineCertificateError {
@@ -78,10 +80,22 @@ public:
     bool isOverridable() const;
     QString errorDescription() const;
 
+    QWebEngineCertificateError(const QWebEngineCertificateError &other);
+    QWebEngineCertificateError& operator=(const QWebEngineCertificateError &other);
+
+    void defer();
+    bool deferred() const;
+
+    void rejectCertificate();
+    void ignoreCertificateError();
+    bool answered() const;
+
+    QList<QSslCertificate> chain() const;
+
 private:
-    Q_DISABLE_COPY(QWebEngineCertificateError)
-    Q_DECLARE_PRIVATE(QWebEngineCertificateError)
-    QScopedPointer<QWebEngineCertificateErrorPrivate> d_ptr;
+    friend class QWebEnginePagePrivate;
+    QWebEngineCertificateError(const QSharedPointer<CertificateErrorController> &controller);
+    QExplicitlySharedDataPointer<QWebEngineCertificateErrorPrivate> d;
 };
 
 QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.cpp b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
index 7ce572e2f..7b0cfe074 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.cpp
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -124,8 +124,9 @@ static inline QWebEngineDownloadItem::DownloadInterruptReason toDownloadInterrup
     then the download request will be automatically rejected and nothing will be
     written to disk.
 
-    \note Some properties, like the \l path under which the file will be saved,
-    can only be changed before calling accept().
+    \note Some properties, such as setting the path and file name where the file
+    will be saved (see \l downloadDirectory() and \l downloadFileName()), can
+    only be changed before calling accept().
 
     \section2 Object Life Cycle
 
@@ -510,6 +511,10 @@ QString QWebEngineDownloadItem::mimeType() const
 
 /*!
     \obsolete
+
+    Use \l suggestedFileName(), \l downloadDirectory(), and
+    \l downloadFileName() instead.
+
     Returns the full target path where data is being downloaded to.
 
     The path includes the file name. The default suggested path is the standard download location
@@ -523,6 +528,10 @@ QString QWebEngineDownloadItem::path() const
 }
 
 /*!
+    \obsolete
+
+    Use \l setDownloadDirectory() and \l setDownloadFileName() instead.
+
     Sets the full target path to download the file to.
 
     The \a path should also include the file name. The download path can only be set in response
@@ -572,7 +581,7 @@ QString QWebEngineDownloadItem::downloadDirectory() const
 /*!
     \since 5.14
 
-    Sets the directory path to download the file to.
+    Sets \a directory as the directory path to download the file to.
 
     The download directory path can only be set in response to the QWebEngineProfile::downloadRequested()
     signal before the download is accepted. Past that point, this function has no effect on the
@@ -598,7 +607,7 @@ void QWebEngineDownloadItem::setDownloadDirectory(QString directory)
 /*!
     \since 5.14
 
-    Returns the suggested file name.
+    Returns the file name to download the file to.
 */
 
 QString QWebEngineDownloadItem::downloadFileName() const
@@ -610,7 +619,7 @@ QString QWebEngineDownloadItem::downloadFileName() const
 /*!
     \since 5.14
 
-    Sets the file name to download the file to.
+    Sets \a fileName as the file name to download the file to.
 
     The download file name can only be set in response to the QWebEngineProfile::downloadRequested()
     signal before the download is accepted. Past that point, this function has no effect on the
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index e990170eb..b22d47916 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -45,12 +45,14 @@
 #include "certificate_error_controller.h"
 #include "color_chooser_controller.h"
 #include "favicon_manager.h"
+#include "find_text_helper.h"
 #include "file_picker_controller.h"
 #include "javascript_dialog_controller.h"
 #if QT_CONFIG(webengine_printing_and_pdf)
 #include "printer_worker.h"
 #endif
 #include "qwebenginecertificateerror.h"
+#include "qwebenginefindtextresult.h"
 #include "qwebenginefullscreenrequest.h"
 #include "qwebenginehistory.h"
 #include "qwebenginehistory_p.h"
@@ -170,6 +172,7 @@ QWebEnginePagePrivate::QWebEnginePagePrivate(QWebEngineProfile *_profile)
 
     qRegisterMetaType<QWebEngineQuotaRequest>();
     qRegisterMetaType<QWebEngineRegisterProtocolHandlerRequest>();
+    qRegisterMetaType<QWebEngineFindTextResult>();
 
     // See setVisible().
     wasShownTimer.setSingleShot(true);
@@ -291,6 +294,7 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
         return;
 
     isLoading = true;
+    m_certificateErrorControllers.clear();
     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
 }
 
@@ -420,11 +424,6 @@ void QWebEnginePagePrivate::didFetchDocumentInnerText(quint64 requestId, const Q
     m_callbacks.invoke(requestId, result);
 }
 
-void QWebEnginePagePrivate::didFindText(quint64 requestId, int matchCount)
-{
-    m_callbacks.invoke(requestId, matchCount > 0);
-}
-
 void QWebEnginePagePrivate::didPrintPage(quint64 requestId, QSharedPointer<QByteArray> result)
 {
 #if QT_CONFIG(webengine_printing_and_pdf)
@@ -702,6 +701,12 @@ void QWebEnginePagePrivate::widgetChanged(RenderWidgetHostViewQtDelegate *newWid
     bindPageAndWidget(q, static_cast<RenderWidgetHostViewQtDelegateWidget *>(newWidgetBase));
 }
 
+void QWebEnginePagePrivate::findTextFinished(const QWebEngineFindTextResult &result)
+{
+    Q_Q(QWebEnginePage);
+    Q_EMIT q->findTextFinished(result);
+}
+
 void QWebEnginePagePrivate::ensureInitialized() const
 {
     if (!adapter->isInitialized())
@@ -802,6 +807,16 @@ QWebEnginePage::QWebEnginePage(QObject* parent)
 }
 
 /*!
+    \fn void QWebEnginePage::findTextFinished(const QWebEngineFindTextResult &result)
+    \since 5.14
+
+    This signal is emitted when a search string search on a page is completed. \a result is
+    the result of the string search.
+
+    \sa findText()
+*/
+
+/*!
     \fn void QWebEnginePage::printRequested()
     \since 5.12
 
@@ -963,7 +978,6 @@ QWebEnginePage::~QWebEnginePage()
     if (d_ptr) {
         // d_ptr might be exceptionally null if profile adapter got deleted first
         setDevToolsPage(nullptr);
-        d_ptr->adapter->stopFinding();
         QWebEnginePagePrivate::bindPageAndView(this, nullptr);
         QWebEnginePagePrivate::bindPageAndWidget(this, nullptr);
     }
@@ -1592,16 +1606,11 @@ void QWebEnginePage::findText(const QString &subString, FindFlags options, const
 {
     Q_D(QWebEnginePage);
     if (!d->adapter->isInitialized()) {
-        d->m_callbacks.invokeEmpty(resultCallback);
+        QtWebEngineCore::CallbackDirectory().invokeEmpty(resultCallback);
         return;
     }
-    if (subString.isEmpty()) {
-        d->adapter->stopFinding();
-        d->m_callbacks.invokeEmpty(resultCallback);
-    } else {
-        quint64 requestId = d->adapter->findText(subString, options & FindCaseSensitively, options & FindBackward);
-        d->m_callbacks.registerCallback(requestId, resultCallback);
-    }
+
+    d->adapter->findTextHelper()->startFinding(subString, options & FindCaseSensitively, options & FindBackward, resultCallback);
 }
 
 /*!
@@ -1652,8 +1661,8 @@ void QWebEnginePagePrivate::navigationRequested(int navigationType, const QUrl &
 {
     Q_Q(QWebEnginePage);
     bool accepted = q->acceptNavigationRequest(url, static_cast<QWebEnginePage::NavigationType>(navigationType), isMainFrame);
-    if (accepted && adapter->isFindTextInProgress())
-        adapter->stopFinding();
+    if (accepted && adapter->findTextHelper()->isFindTextInProgress())
+        adapter->findTextHelper()->stopFinding();
     navigationRequestAction = accepted ? WebContentsAdapterClient::AcceptRequest : WebContentsAdapterClient::IgnoreRequest;
 }
 
@@ -1707,10 +1716,11 @@ void QWebEnginePagePrivate::allowCertificateError(const QSharedPointer<Certifica
     Q_Q(QWebEnginePage);
     bool accepted = false;
 
-    QWebEngineCertificateError error(controller->error(), controller->url(), controller->overridable() && !controller->strictEnforcement(), controller->errorString());
+    QWebEngineCertificateError error(controller);
     accepted = q->certificateError(error);
-
-    if (error.isOverridable())
+    if (error.deferred() && !error.answered())
+        m_certificateErrorControllers.append(controller);
+    else if (!error.answered() && error.isOverridable())
         controller->accept(accepted);
 }
 
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 736d7ed69..cd012ea70 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -62,6 +62,7 @@ class QWebChannel;
 class QWebEngineCertificateError;
 class QWebEngineClientCertificateSelection;
 class QWebEngineContextMenuData;
+class QWebEngineFindTextResult;
 class QWebEngineFullScreenRequest;
 class QWebEngineHistory;
 class QWebEnginePage;
@@ -369,6 +370,8 @@ Q_SIGNALS:
     void lifecycleStateChanged(LifecycleState state);
     void recommendedStateChanged(LifecycleState state);
 
+    void findTextFinished(const QWebEngineFindTextResult &result);
+
 protected:
     virtual QWebEnginePage *createWindow(WebWindowType type);
     virtual QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes);
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index acf95a265..2843f69c4 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -72,6 +72,7 @@ class WebContentsAdapter;
 }
 
 QT_BEGIN_NAMESPACE
+class QWebEngineFindTextResult;
 class QWebEngineHistory;
 class QWebEnginePage;
 class QWebEngineProfile;
@@ -127,7 +128,6 @@ public:
     void didRunJavaScript(quint64 requestId, const QVariant& result) override;
     void didFetchDocumentMarkup(quint64 requestId, const QString& result) override;
     void didFetchDocumentInnerText(quint64 requestId, const QString& result) override;
-    void didFindText(quint64 requestId, int matchCount) override;
     void didPrintPage(quint64 requestId, QSharedPointer<QByteArray> result) override;
     void didPrintPageToPdf(const QString &filePath, bool success) override;
     bool passOnFocus(bool reverse) override;
@@ -163,6 +163,7 @@ public:
     ClientType clientType() override { return QtWebEngineCore::WebContentsAdapterClient::WidgetsClient; }
     void interceptRequest(QWebEngineUrlRequestInfo &) override;
     void widgetChanged(QtWebEngineCore::RenderWidgetHostViewQtDelegate *newWidget) override;
+    void findTextFinished(const QWebEngineFindTextResult &result) override;
 
     QtWebEngineCore::ProfileAdapter *profileAdapter() override;
     QtWebEngineCore::WebContentsAdapter *webContentsAdapter() override;
@@ -209,6 +210,8 @@ public:
 #if QT_CONFIG(webengine_printing_and_pdf)
     QPrinter *currentPrinter;
 #endif
+
+    QList<QSharedPointer<CertificateErrorController>> m_certificateErrorControllers;
 };
 
 class QContextMenuBuilder : public QtWebEngineCore::RenderViewContextMenuQt
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index 6e2db533e..4a77eb8cf 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -101,7 +101,7 @@ using QtWebEngineCore::ProfileAdapter;
     web pages not specifically created with another profile belong to.
 
     Implementing the QWebEngineUrlRequestInterceptor interface and registering the interceptor on a
-    profile by setRequestInterceptor() enables intercepting, blocking, and modifying URL
+    profile by setUrlRequestInterceptor() enables intercepting, blocking, and modifying URL
     requests (QWebEngineUrlRequestInfo) before they reach the networking stack of Chromium.
 
     A QWebEngineUrlSchemeHandler can be registered for a profile by installUrlSchemeHandler()