Unify certificate error handling

Before we move the certificate error to core, unify
error handling between qml and widgets.

[ChangeLog]  WebPage::certificateError does not return bool
it is enough to call defer, ignoreCertificateError()
or rejectCertificate().

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

3 files changed, 9 insertions, 17 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index f5bec06fb..3c8f6e488 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -1723,14 +1723,12 @@ void QWebEnginePagePrivate::javascriptDialog(QSharedPointer<JavaScriptDialogCont
 void QWebEnginePagePrivate::allowCertificateError(const QSharedPointer<CertificateErrorController> &controller)
 {
     Q_Q(QWebEnginePage);
-    bool accepted = false;
-
     QWebEngineCertificateError error(controller);
-    accepted = q->certificateError(error);
-    if (error.deferred() && !error.answered())
+    q->certificateError(error);
+    if (!error.isOverridable() || (!error.deferred() && !error.answered()))
+        error.rejectCertificate();
+    else
         m_certificateErrorControllers.append(controller);
-    else if (!error.answered())
-        controller->accept(error.isOverridable() && accepted);
 }
 
 void QWebEnginePagePrivate::selectClientCert(const QSharedPointer<ClientCertSelectController> &controller)
@@ -2390,10 +2388,7 @@ void QWebEnginePage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel leve
     }
 }
 
-bool QWebEnginePage::certificateError(const QWebEngineCertificateError &)
-{
-    return false;
-}
+void QWebEnginePage::certificateError(const QWebEngineCertificateError &) { }
 
 bool QWebEnginePage::acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame)
 {
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 97f32e43f..c1fff2ac2 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -375,7 +375,7 @@ protected:
     virtual bool javaScriptConfirm(const QUrl &securityOrigin, const QString& msg);
     virtual bool javaScriptPrompt(const QUrl &securityOrigin, const QString& msg, const QString& defaultValue, QString* result);
     virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID);
-    virtual bool certificateError(const QWebEngineCertificateError &certificateError);
+    virtual void certificateError(const QWebEngineCertificateError &certificateError);
     virtual bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame);
 
 private:
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 789d9794e..5def0d65c 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -513,16 +513,13 @@
 */
 
 /*!
-    \fn bool QWebEnginePage::certificateError(const QWebEngineCertificateError & certificateError)
+    \fn void QWebEnginePage::certificateError(const QWebEngineCertificateError & certificateError)
     This function is called when an invalid certificate error is raised while loading a given request.
 
-    The \a certificateError parameter contains information about the certificate and details of the error.
-
-    Return \c true to ignore the error and complete the request. Return \c false to stop loading
+    The \a certificateError parameter contains information about the certificate and details of the error,
+    it also provides the way to ignore the error and complete the request or stop loading
     the request.
 
-    \note If the error was successfully deferred then the returned value will be ignored.
-
     \sa QWebEngineCertificateError
 */