Merge branch '5.6' into dev

Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78

1 files changed, 12 insertions, 6 deletions

diff --git a/src/core/cookie_monster_delegate_qt.cpp b/src/core/cookie_monster_delegate_qt.cpp
index a81670a6c..3689d54d7 100644
--- a/src/core/cookie_monster_delegate_qt.cpp
+++ b/src/core/cookie_monster_delegate_qt.cpp
@@ -44,8 +44,6 @@
 #include "api/qwebenginecookiestore_p.h"
 #include "type_conversion.h"
 
-#include <QStringBuilder>
-
 namespace QtWebEngineCore {
 
 static GURL sourceUrlForCookie(const QNetworkCookie &cookie) {
@@ -139,10 +137,18 @@ void CookieMonsterDelegateQt::deleteAllCookies(quint64 callbackId)
 
 void CookieMonsterDelegateQt::setCookieMonster(net::CookieMonster* monster)
 {
+    if (!monster && !m_cookieMonster)
+        return;
+
     m_cookieMonster = monster;
 
-    if (m_client)
+    if (!m_client)
+        return;
+
+    if (monster)
         m_client->d_func()->processPendingUserCookies();
+    else
+        m_client->d_func()->rejectPendingUserCookies();
 }
 
 void CookieMonsterDelegateQt::setClient(QWebEngineCookieStore *client)
@@ -152,7 +158,7 @@ void CookieMonsterDelegateQt::setClient(QWebEngineCookieStore *client)
     if (!m_client)
         return;
 
-    m_client->d_ptr->delegate = this;
+    m_client->d_func()->delegate = this;
 
     if (hasCookieMonster())
         m_client->d_func()->processPendingUserCookies();
@@ -163,14 +169,14 @@ bool CookieMonsterDelegateQt::canSetCookie(const QUrl &firstPartyUrl, const QByt
     if (!m_client)
         return true;
 
-    return m_client->d_ptr->canSetCookie(firstPartyUrl, cookieLine, url);
+    return m_client->d_func()->canSetCookie(firstPartyUrl, cookieLine, url);
 }
 
 void CookieMonsterDelegateQt::OnCookieChanged(const net::CanonicalCookie& cookie, bool removed, ChangeCause cause)
 {
     if (!m_client)
         return;
-    m_client->d_ptr->onCookieChanged(toQt(cookie), removed);
+    m_client->d_func()->onCookieChanged(toQt(cookie), removed);
 }
 
 }