diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-08-08 09:03:50 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-08-10 08:23:38 +0000 |
| commit | 0358558a3a22c0fdb586de95e4c48bced96ff6c5 (patch) | |
| tree | 184cbca418c6739decc9d39cd5810da6a81ccea4 /src/core/api | |
| parent | 80f42a0955365d641d7ca6cb5e99d0a8252a543e (diff) | |
Unfriend NetworkDeleagte from ProfileIOData
Directly accessing IOProfileData's m_requestInterceptor
from NetworkDelegateQt is not thread safe, unfriend
the class.
This change does not fix the issue of thread safety of
accessing the requestinterceptor from NetworkDelegateQt,
it is just a cleanup for following commit.
Task-number: QTBUG-69844
Change-Id: I488f8968b38ad200178cea2cb0304e1c93aec711
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/api')
| -rw-r--r-- | src/core/api/qwebenginecookiestore.cpp | 2 | ||||
| -rw-r--r-- | src/core/api/qwebenginecookiestore_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp index 21610e334..abb39f074 100644 --- a/src/core/api/qwebenginecookiestore.cpp +++ b/src/core/api/qwebenginecookiestore.cpp @@ -190,7 +190,7 @@ void QWebEngineCookieStorePrivate::onCookieChanged(const QNetworkCookie &cookie, Q_EMIT q_ptr->cookieAdded(cookie); } -bool QWebEngineCookieStorePrivate::canAccessCookies(const QUrl &firstPartyUrl, const QUrl &url) +bool QWebEngineCookieStorePrivate::canAccessCookies(const QUrl &firstPartyUrl, const QUrl &url) const { if (!filterCallback) return true; diff --git a/src/core/api/qwebenginecookiestore_p.h b/src/core/api/qwebenginecookiestore_p.h index c7ab429d8..93198d8ed 100644 --- a/src/core/api/qwebenginecookiestore_p.h +++ b/src/core/api/qwebenginecookiestore_p.h @@ -97,7 +97,7 @@ public: void deleteAllCookies(); void getAllCookies(); - bool canAccessCookies(const QUrl &firstPartyUrl, const QUrl &url); + bool canAccessCookies(const QUrl &firstPartyUrl, const QUrl &url) const; void onGetAllCallbackResult(qint64 callbackId, const QByteArray &cookieList); void onSetCallbackResult(qint64 callbackId, bool success); |