Simplify WebEngineCertificateError

Removes certificateErrorControllerPrivate,
moves error handling logic to core.

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

2 files changed, 2 insertions, 12 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 7f0d1df84..438701d53 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -41,7 +41,6 @@
 #include "qquickwebengineview_p_p.h"
 #include "authentication_dialog_controller.h"
 #include "profile_adapter.h"
-#include "certificate_error_controller.h"
 #include "file_picker_controller.h"
 #include "find_text_helper.h"
 #include "javascript_dialog_controller.h"
@@ -97,7 +96,6 @@
 #include <QTimer>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/qpa/qplatformintegration.h>
-
 QT_BEGIN_NAMESPACE
 using namespace QtWebEngineCore;
 
@@ -292,16 +290,10 @@ void QQuickWebEngineViewPrivate::javascriptDialog(QSharedPointer<JavaScriptDialo
         ui()->showDialog(dialog);
 }
 
-void QQuickWebEngineViewPrivate::allowCertificateError(const QSharedPointer<CertificateErrorController> &controller)
+void QQuickWebEngineViewPrivate::allowCertificateError(const QWebEngineCertificateError &error)
 {
     Q_Q(QQuickWebEngineView);
-
-    QWebEngineCertificateError error(controller);
     Q_EMIT q->certificateError(error);
-    if (!error.isOverridable() || (!error.deferred() && !error.answered()))
-        error.rejectCertificate();
-    else
-        m_certificateErrorControllers.append(controller);
 }
 
 void QQuickWebEngineViewPrivate::selectClientCert(const QSharedPointer<ClientCertSelectController> &controller)
@@ -468,7 +460,6 @@ void QQuickWebEngineViewPrivate::loadStarted(const QUrl &provisionalUrl, bool is
 
     isLoading = true;
     m_history->reset();
-    CertificateErrorController::clear(m_certificateErrorControllers);
 
     QTimer::singleShot(0, q, [q, provisionalUrl]() {
         QQuickWebEngineLoadRequest loadRequest(provisionalUrl, QQuickWebEngineView::LoadStartedStatus);
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index 790853ebd..b81be873b 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -147,7 +147,7 @@ public:
     void runRegisterProtocolHandlerRequest(QWebEngineRegisterProtocolHandlerRequest) override;
     QObject *accessibilityParentObject() override;
     QtWebEngineCore::WebEngineSettings *webEngineSettings() const override;
-    void allowCertificateError(const QSharedPointer<CertificateErrorController> &errorController) override;
+    void allowCertificateError(const QWebEngineCertificateError &error) override;
     void selectClientCert(const QSharedPointer<ClientCertSelectController> &selectController) override;
     void runFeaturePermissionRequest(QtWebEngineCore::ProfileAdapter::PermissionType permission, const QUrl &securityOrigin) override;
     void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode) override;
@@ -211,7 +211,6 @@ public:
     bool m_navigationActionTriggered;
     qreal devicePixelRatio;
     QMap<quint64, QJSValue> m_callbacks;
-    QList<QWeakPointer<CertificateErrorController> > m_certificateErrorControllers;
     QQmlWebChannel *m_webChannel;
     QPointer<QQuickWebEngineView> inspectedView;
     QPointer<QQuickWebEngineView> devToolsView;