From 26bc12617efaae040dbd6166c2da27236104bf43 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 13 Jul 2020 13:38:00 +0200
Subject: Simplify WebEngineCertificateError

Removes certificateErrorControllerPrivate,
moves error handling logic to core.

Change-Id: I050f73f1e37eb9ae39ad471fe1673d2b6140cf89
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/webenginewidgets/api/qwebenginepage.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/webenginewidgets/api/qwebenginepage.cpp')

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 3919366dc..a48d3a934 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -42,7 +42,6 @@
 
 #include "authentication_dialog_controller.h"
 #include "profile_adapter.h"
-#include "certificate_error_controller.h"
 #include "color_chooser_controller.h"
 #include "favicon_manager.h"
 #include "find_text_helper.h"
@@ -278,7 +277,6 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
         return;
 
     isLoading = true;
-    CertificateErrorController::clear(m_certificateErrorControllers);
 
     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
 }
@@ -1721,15 +1719,10 @@ void QWebEnginePagePrivate::javascriptDialog(QSharedPointer<JavaScriptDialogCont
         controller->reject();
 }
 
-void QWebEnginePagePrivate::allowCertificateError(const QSharedPointer<CertificateErrorController> &controller)
+void QWebEnginePagePrivate::allowCertificateError(const QWebEngineCertificateError &error)
 {
     Q_Q(QWebEnginePage);
-    QWebEngineCertificateError error(controller);
     q->certificateError(error);
-    if (!error.isOverridable() || (!error.deferred() && !error.answered()))
-        error.rejectCertificate();
-    else
-        m_certificateErrorControllers.append(controller);
 }
 
 void QWebEnginePagePrivate::selectClientCert(const QSharedPointer<ClientCertSelectController> &controller)
-- 
cgit v1.2.3