diff options
author | Kirill Burtsev <kirill.burtsev@qt.io> | 2019-08-14 18:37:35 +0200 |
---|---|---|
committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2019-08-29 16:30:09 +0000 |
commit | 83c5182c998b74858c5c28fcf2feb1d4e07754bb (patch) | |
tree | f223bb281a34a7f2499d7b9fd8037d84929a8942 /src/core/certificate_error_controller.cpp | |
parent | c75c3670e44bb848b043918fb742a86e5fba780d (diff) |
Fix reporting overridable flag for QML WebEngineCertificateError type
Also remove confusion inside CertificateErrorController constructor
and overridable method by matching documentation for
AllowCertificateError method of ContentBrowserClient api.
Change-Id: I7e10ef71a4429dcf5acc4b714a8a45f67a2ec684
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/certificate_error_controller.cpp')
-rw-r--r-- | src/core/certificate_error_controller.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/certificate_error_controller.cpp b/src/core/certificate_error_controller.cpp index a747451df..3309db8f1 100644 --- a/src/core/certificate_error_controller.cpp +++ b/src/core/certificate_error_controller.cpp @@ -79,14 +79,14 @@ CertificateErrorControllerPrivate::CertificateErrorControllerPrivate(int cert_er const net::SSLInfo& ssl_info, const GURL &request_url, content::ResourceType resource_type, - bool _overridable, + bool fatal_error, bool strict_enforcement, const base::Callback<void(content::CertificateRequestResultType)>& cb ) : certError(CertificateErrorController::CertificateError(cert_error)) , requestUrl(toQt(request_url)) , resourceType(CertificateErrorController::ResourceType(resource_type)) - , overridable(_overridable) + , fatalError(fatal_error) , strictEnforcement(strict_enforcement) , callback(cb) { @@ -118,7 +118,7 @@ QUrl CertificateErrorController::url() const bool CertificateErrorController::overridable() const { - return d->overridable; + return !d->fatalError && !d->strictEnforcement; } bool CertificateErrorController::strictEnforcement() const |