1 files changed, 36 insertions, 76 deletions
diff --git a/src/core/net/cookie_monster_delegate_qt.h b/src/core/net/cookie_monster_delegate_qt.h
index 2ac04acb4..f6872323d 100644
--- a/src/core/net/cookie_monster_delegate_qt.h
+++ b/src/core/net/cookie_monster_delegate_qt.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 //
 //  W A R N I N G
@@ -53,70 +17,66 @@
 
 #include "qtwebenginecoreglobal_p.h"
 
-QT_WARNING_PUSH
-// For some reason adding -Wno-unused-parameter to QMAKE_CXXFLAGS has no
-// effect with clang, so use a pragma for these dirty chromium headers
-QT_WARNING_DISABLE_CLANG("-Wunused-parameter")
+// We need to work around Chromium using 'signals' as a variable name in headers:
+#ifdef signals
+#define StAsH_signals signals
+#undef signals
+#endif
 #include "base/memory/ref_counted.h"
-#include "net/cookies/cookie_monster.h"
-QT_WARNING_POP
+#include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
+#include "net/cookies/cookie_store.h"
+#include "services/network/public/mojom/cookie_manager.mojom-forward.h"
+#include "services/network/public/mojom/cookie_manager.mojom.h"
+#ifdef StAsH_signals
+#define signals StAsH_signals
+#undef StAsH_signals
+#endif
 
-#include <QNetworkCookie>
 #include <QPointer>
 
+QT_FORWARD_DECLARE_CLASS(QNetworkCookie)
 QT_FORWARD_DECLARE_CLASS(QWebEngineCookieStore)
 
 namespace QtWebEngineCore {
 
-// Extends net::CookieMonster::kDefaultCookieableSchemes with qrc, without enabling
-// cookies for the file:// scheme, which is disabled by default in Chromium.
-// Since qrc:// is similar to file:// and there are some unknowns about how
-// to correctly handle file:// cookies, qrc:// should only be used for testing.
-static const char* const kCookieableSchemes[] =
-    { "http", "https", "qrc", "ws", "wss" };
+class CookieMonsterDelegateQtPrivate;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT CookieMonsterDelegateQt : public base::RefCountedThreadSafe<CookieMonsterDelegateQt> {
+class Q_WEBENGINECORE_EXPORT CookieMonsterDelegateQt : public base::RefCountedThreadSafe<CookieMonsterDelegateQt>
+{
     QPointer<QWebEngineCookieStore> m_client;
-    net::CookieMonster *m_cookieMonster;
     std::vector<std::unique_ptr<net::CookieChangeSubscription>> m_subscriptions;
+
+    mojo::Remote<network::mojom::CookieManager> m_mojoCookieManager;
+    std::unique_ptr<network::mojom::CookieChangeListener> m_listener;
+    std::unique_ptr<network::mojom::CookieRemoteAccessFilter> m_filter;
+    mojo::Receiver<network::mojom::CookieChangeListener> m_receiver;
+    mojo::Receiver<network::mojom::CookieRemoteAccessFilter> m_filterReceiver;
+    bool m_hasFilter;
 public:
     CookieMonsterDelegateQt();
     ~CookieMonsterDelegateQt();
 
     bool hasCookieMonster();
 
-    void setCookie(quint64 callbackId, const QNetworkCookie &cookie, const QUrl &origin);
+    void setCookie(const QNetworkCookie &cookie, const QUrl &origin);
     void deleteCookie(const QNetworkCookie &cookie, const QUrl &origin);
-    void getAllCookies(quint64 callbackId);
-    void deleteSessionCookies(quint64 callbackId);
-    void deleteAllCookies(quint64 callbackId);
+    void getAllCookies();
+    void deleteSessionCookies();
+    void deleteAllCookies();
 
-    void setCookieMonster(net::CookieMonster* monster);
     void setClient(QWebEngineCookieStore *client);
+    void setMojoCookieManager(mojo::PendingRemote<network::mojom::CookieManager> cookie_manager_info);
+    void unsetMojoCookieManager();
+    void setHasFilter(bool b);
 
     bool canSetCookie(const QUrl &firstPartyUrl, const QByteArray &cookieLine, const QUrl &url) const;
     bool canGetCookies(const QUrl &firstPartyUrl, const QUrl &url) const;
 
     void AddStore(net::CookieStore *store);
-    void OnCookieChanged(const net::CanonicalCookie &cookie, net::CookieChangeCause cause);
-
-private:
-    void GetAllCookiesOnIOThread(net::CookieMonster::GetCookieListCallback callback);
-    void SetCookieOnIOThread(const GURL& url, const std::string& cookie_line, net::CookieMonster::SetCookiesCallback callback);
-    void DeleteCookieOnIOThread(const GURL& url, const std::string& cookie_name);
-    void DeleteSessionCookiesOnIOThread(net::CookieMonster::DeleteCallback callback);
-    void DeleteAllOnIOThread(net::CookieMonster::DeleteCallback callback);
-
-    void GetCookiesToDeleteCallback(const std::string& cookie_name, const net::CookieList &cookies, const net::CookieStatusList &statusList);
-    void GetAllCookiesCallbackOnIOThread(qint64 callbackId, const net::CookieList &cookies, const net::CookieStatusList &statusList);
-    void SetCookieCallbackOnIOThread(qint64 callbackId, net::CanonicalCookie::CookieInclusionStatus status);
-    void DeleteCookiesCallbackOnIOThread(qint64 callbackId, uint numCookies);
-
-    void GetAllCookiesCallbackOnUIThread(qint64 callbackId, const QByteArray &cookies);
-    void SetCookieCallbackOnUIThread(qint64 callbackId, net::CanonicalCookie::CookieInclusionStatus status);
-    void DeleteCookiesCallbackOnUIThread(qint64 callbackId, uint numCookies);
+    void OnCookieChanged(const net::CookieChangeInfo &change);
 };
 
-}
+} // namespace QtWebEngineCore
 
 #endif // COOKIE_MONSTER_DELEGATE_QT_H