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/profile_io_data_qt.h | |
| 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/profile_io_data_qt.h')
| -rw-r--r-- | src/core/profile_io_data_qt.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/profile_io_data_qt.h b/src/core/profile_io_data_qt.h index db0ec0146..7c4dae14b 100644 --- a/src/core/profile_io_data_qt.h +++ b/src/core/profile_io_data_qt.h @@ -88,6 +88,9 @@ public: void generateUserAgent(); void generateJobFactory(); void regenerateJobFactory(); + QWebEngineUrlRequestInterceptor *requestInterceptor(); + bool canSetCookie(const QUrl &firstPartyUrl, const QByteArray &cookieLine, const QUrl &url) const; + bool canGetCookies(const QUrl &firstPartyUrl, const QUrl &url) const; void setRequestContextData(content::ProtocolHandlerMap *protocolHandlers, content::URLRequestInterceptorScopedVector request_interceptors); @@ -138,7 +141,6 @@ private: bool m_updateUserAgent = false; bool m_ignoreCertificateErrors = false; base::WeakPtrFactory<ProfileIODataQt> m_weakPtrFactory; // this should be always the last member - friend class NetworkDelegateQt; DISALLOW_COPY_AND_ASSIGN(ProfileIODataQt); }; } // namespace QtWebEngineCore |