diff options
author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2015-12-07 06:39:13 -0800 |
---|---|---|
committer | Szabolcs David <davidsz@inf.u-szeged.hu> | 2016-01-05 13:08:40 +0000 |
commit | 2656cdbeb0a45357cfb2621b0307a4e1462fbaaf (patch) | |
tree | 783ff611f7d39dbd990713b6a394bbef654924cd /src/core/api/qwebenginecookiestore.cpp | |
parent | 3f92ac7456a6c89fee71623594058c928a727204 (diff) |
Fix an assertion in QWebEngineCookieStore
Don't process pending cookies after resetting the CookieMonster
to 0 in the CookieMonsterDelegateQt. We are destroying the old
cookie store, so we can reject the pending cookies here.
Task-number: QTBUG-50160
Change-Id: I0b2ca7ee0f5e3fdcf99680bb9c0a2772a10ff3f4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/api/qwebenginecookiestore.cpp')
-rw-r--r-- | src/core/api/qwebenginecookiestore.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp index 89272057e..2938eddbd 100644 --- a/src/core/api/qwebenginecookiestore.cpp +++ b/src/core/api/qwebenginecookiestore.cpp @@ -88,6 +88,14 @@ void QWebEngineCookieStorePrivate::processPendingUserCookies() m_pendingUserCookies.clear(); } +void QWebEngineCookieStorePrivate::rejectPendingUserCookies() +{ + m_getAllCookiesPending = false; + m_deleteAllCookiesPending = false; + m_deleteSessionCookiesPending = false; + m_pendingUserCookies.clear(); +} + void QWebEngineCookieStorePrivate::setCookie(const QWebEngineCallback<bool> &callback, const QNetworkCookie &cookie, const QUrl &origin) { const quint64 currentCallbackId = callback ? m_nextCallbackId++ : static_cast<quint64>(CallbackDirectory::NoCallbackId); |