Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: If771fabe97c4d75edc4627999f04f70ca1901060

1 files changed, 7 insertions, 1 deletions

diff --git a/src/core/net/client_cert_override.h b/src/core/net/client_cert_override.h
index 4f13c3116..35c1f96af 100644
--- a/src/core/net/client_cert_override.h
+++ b/src/core/net/client_cert_override.h
@@ -49,16 +49,22 @@ class SSLCertRequestInfo;
 } // namespace net
 
 namespace QtWebEngineCore {
+struct ClientCertificateStoreData;
 
 class ClientCertOverrideStore : public net::ClientCertStore
 {
 public:
-    ClientCertOverrideStore();
+    ClientCertOverrideStore(ClientCertificateStoreData *storeData);
     virtual ~ClientCertOverrideStore() override;
     void GetClientCerts(const net::SSLCertRequestInfo &cert_request_info,
                         const ClientCertListCallback &callback) override;
 private:
     static std::unique_ptr<net::ClientCertStore> createNativeStore();
+    net::ClientCertIdentityList GetClientCertsOnUIThread(const net::SSLCertRequestInfo &request);
+    void GetClientCertsReturn(const net::SSLCertRequestInfo &cert_request_info,
+                              const ClientCertListCallback &callback,
+                              net::ClientCertIdentityList &&result);
+    ClientCertificateStoreData *m_storeData;
     std::unique_ptr<net::ClientCertStore> m_nativeStore;
 };