<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[212283] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/212283">212283</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-14 02:43:14 -0800 (Tue, 14 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>CookieManager only works with the default session
https://bugs.webkit.org/show_bug.cgi?id=168229
Reviewed by Alex Christensen.
Source/WebCore:
Update cookie observer API to use a std::function instead of a function pointer and make it work with multiple
sessions in the backends that support it.
* platform/network/CookieStorage.h:
* platform/network/cf/CookieStorageCFNet.cpp:
(WebCore::cookieChangeCallbackMap):
(WebCore::notifyCookiesChanged):
(WebCore::startObservingCookieChanges):
(WebCore::stopObservingCookieChanges):
* platform/network/mac/CookieStorageMac.mm:
(-[WebCookieStorageObjCAdapter startListeningForCookieChangeNotificationsWithCallback:]):
(-[WebCookieStorageObjCAdapter stopListeningForCookieChangeNotifications]):
(WebCore::startObservingCookieChanges):
(WebCore::stopObservingCookieChanges):
* platform/network/soup/CookieStorageSoup.cpp:
(WebCore::cookieChangeCallbackMap):
(WebCore::soupCookiesChanged):
(WebCore::startObservingCookieChanges):
(WebCore::stopObservingCookieChanges):
Source/WebKit2:
Make CookieManager session aware by adding a SessionID parameter to all its functions, and update all the callers
to pass the default session ID, preserving the current
behavior. WebCookieManagerProxy::startObservingCookieChanges() now also receives an optional callback to be
called on every change.
* UIProcess/API/C/WKCookieManager.cpp:
(WKCookieManagerGetHostnamesWithCookies):
(WKCookieManagerDeleteCookiesForHostname):
(WKCookieManagerDeleteAllCookies):
(WKCookieManagerDeleteAllCookiesModifiedAfterDate):
(WKCookieManagerStartObservingCookieChanges):
(WKCookieManagerStopObservingCookieChanges):
* UIProcess/API/gtk/WebKitCookieManager.cpp:
(_WebKitCookieManagerPrivate::~_WebKitCookieManagerPrivate):
(webkitCookieManagerCreate):
(webkit_cookie_manager_set_persistent_storage):
(webkit_cookie_manager_get_domains_with_cookies):
(webkit_cookie_manager_delete_cookies_for_domain):
(webkit_cookie_manager_delete_all_cookies):
* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::WebAutomationSession::addSingleCookie):
(WebKit::WebAutomationSession::deleteAllCookies):
* UIProcess/WebCookieManagerProxy.cpp:
(WebKit::WebCookieManagerProxy::getHostnamesWithCookies):
(WebKit::WebCookieManagerProxy::deleteCookiesForHostname):
(WebKit::WebCookieManagerProxy::deleteAllCookies):
(WebKit::WebCookieManagerProxy::deleteAllCookiesModifiedSince):
(WebKit::WebCookieManagerProxy::addCookie):
(WebKit::WebCookieManagerProxy::startObservingCookieChanges):
(WebKit::WebCookieManagerProxy::stopObservingCookieChanges):
(WebKit::WebCookieManagerProxy::cookiesDidChange):
* UIProcess/WebCookieManagerProxy.h:
* UIProcess/WebCookieManagerProxy.messages.in:
* WebProcess/Cookies/WebCookieManager.cpp:
(WebKit::WebCookieManager::WebCookieManager):
(WebKit::WebCookieManager::getHostnamesWithCookies):
(WebKit::WebCookieManager::deleteCookiesForHostname):
(WebKit::WebCookieManager::deleteAllCookies):
(WebKit::WebCookieManager::deleteAllCookiesModifiedSince):
(WebKit::WebCookieManager::addCookie):
(WebKit::WebCookieManager::startObservingCookieChanges):
(WebKit::WebCookieManager::stopObservingCookieChanges):
* WebProcess/Cookies/WebCookieManager.h:
* WebProcess/Cookies/WebCookieManager.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCookieStorageh">trunk/Source/WebCore/platform/network/CookieStorage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfCookieStorageCFNetcpp">trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacCookieStorageMacmm">trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupCookieStorageSoupcpp">trunk/Source/WebCore/platform/network/soup/CookieStorageSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKCookieManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitCookieManagercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAutomationWebAutomationSessioncpp">trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxyh">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxymessagesin">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessCookiesWebCookieManagercpp">trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessCookiesWebCookieManagerh">trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessCookiesWebCookieManagermessagesin">trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebCore/ChangeLog 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2017-02-14 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ CookieManager only works with the default session
+ https://bugs.webkit.org/show_bug.cgi?id=168229
+
+ Reviewed by Alex Christensen.
+
+ Update cookie observer API to use a std::function instead of a function pointer and make it work with multiple
+ sessions in the backends that support it.
+
+ * platform/network/CookieStorage.h:
+ * platform/network/cf/CookieStorageCFNet.cpp:
+ (WebCore::cookieChangeCallbackMap):
+ (WebCore::notifyCookiesChanged):
+ (WebCore::startObservingCookieChanges):
+ (WebCore::stopObservingCookieChanges):
+ * platform/network/mac/CookieStorageMac.mm:
+ (-[WebCookieStorageObjCAdapter startListeningForCookieChangeNotificationsWithCallback:]):
+ (-[WebCookieStorageObjCAdapter stopListeningForCookieChangeNotifications]):
+ (WebCore::startObservingCookieChanges):
+ (WebCore::stopObservingCookieChanges):
+ * platform/network/soup/CookieStorageSoup.cpp:
+ (WebCore::cookieChangeCallbackMap):
+ (WebCore::soupCookiesChanged):
+ (WebCore::startObservingCookieChanges):
+ (WebCore::stopObservingCookieChanges):
+
</ins><span class="cx"> 2017-02-13 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Update volume and scrubbing slider to match HI designs
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCookieStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CookieStorage.h (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CookieStorage.h 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebCore/platform/network/CookieStorage.h 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -23,17 +23,16 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef CookieStorage_h
-#define CookieStorage_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><ins>+#include <functional>
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// These are always observing the shared cookie storage, even when in private browsing mode.
</del><ins>+class NetworkStorageSession;
</ins><span class="cx">
</span><del>-typedef void(*CookieChangeCallbackPtr)();
-WEBCORE_EXPORT void startObservingCookieChanges(CookieChangeCallbackPtr);
-WEBCORE_EXPORT void stopObservingCookieChanges();
</del><ins>+WEBCORE_EXPORT void startObservingCookieChanges(const NetworkStorageSession&, std::function<void ()>&&);
+WEBCORE_EXPORT void stopObservingCookieChanges(const NetworkStorageSession&);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCookieStorageCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -27,7 +27,9 @@
</span><span class="cx"> #include "CookieStorage.h"
</span><span class="cx">
</span><span class="cx"> #include "NetworkStorageSession.h"
</span><ins>+#include <wtf/HashMap.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="lines">@@ -41,12 +43,17 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx">
</span><del>-static CookieChangeCallbackPtr cookieChangeCallback;
</del><ins>+static HashMap<CFHTTPCookieStorageRef, std::function<void ()>>& cookieChangeCallbackMap()
+{
+ static NeverDestroyed<HashMap<CFHTTPCookieStorageRef, std::function<void ()>>> map;
+ return map;
+}
</ins><span class="cx">
</span><del>-static void notifyCookiesChanged(CFHTTPCookieStorageRef, void *)
</del><ins>+static void notifyCookiesChanged(CFHTTPCookieStorageRef cookieStorage, void *)
</ins><span class="cx"> {
</span><del>- callOnMainThread([] {
- cookieChangeCallback();
</del><ins>+ callOnMainThread([cookieStorage] {
+ if (auto callback = cookieChangeCallbackMap().get(cookieStorage))
+ callback();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -61,35 +68,35 @@
</span><span class="cx"> return loaderRunLoop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void startObservingCookieChanges(CookieChangeCallbackPtr callback)
</del><ins>+void startObservingCookieChanges(const NetworkStorageSession& storageSession, std::function<void ()>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- ASSERT(!cookieChangeCallback);
- cookieChangeCallback = callback;
-
</del><span class="cx"> CFRunLoopRef runLoop = cookieStorageObserverRunLoop();
</span><span class="cx"> ASSERT(runLoop);
</span><span class="cx">
</span><del>- RetainPtr<CFHTTPCookieStorageRef> cookieStorage = NetworkStorageSession::defaultStorageSession().cookieStorage();
</del><ins>+ RetainPtr<CFHTTPCookieStorageRef> cookieStorage = storageSession.cookieStorage();
</ins><span class="cx"> ASSERT(cookieStorage);
</span><span class="cx">
</span><ins>+ ASSERT(cookieChangeCallbackMap().contains(cookieStorage.get()));
+ cookieChangeCallbackMap().add(cookieStorage.get(), WTFMove(callback));
+
</ins><span class="cx"> CFHTTPCookieStorageScheduleWithRunLoop(cookieStorage.get(), runLoop, kCFRunLoopCommonModes);
</span><span class="cx"> CFHTTPCookieStorageAddObserver(cookieStorage.get(), runLoop, kCFRunLoopDefaultMode, notifyCookiesChanged, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void stopObservingCookieChanges()
</del><ins>+void stopObservingCookieChanges(const NetworkStorageSession& storageSession)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- cookieChangeCallback = 0;
-
</del><span class="cx"> CFRunLoopRef runLoop = cookieStorageObserverRunLoop();
</span><span class="cx"> ASSERT(runLoop);
</span><span class="cx">
</span><del>- RetainPtr<CFHTTPCookieStorageRef> cookieStorage = NetworkStorageSession::defaultStorageSession().cookieStorage();
</del><ins>+ RetainPtr<CFHTTPCookieStorageRef> cookieStorage = storageSession.cookieStorage();
</ins><span class="cx"> ASSERT(cookieStorage);
</span><span class="cx">
</span><ins>+ cookieChangeCallbackMap().remove(cookieStorage.get());
+
</ins><span class="cx"> CFHTTPCookieStorageRemoveObserver(cookieStorage.get(), runLoop, kCFRunLoopDefaultMode, notifyCookiesChanged, 0);
</span><span class="cx"> CFHTTPCookieStorageUnscheduleFromRunLoop(cookieStorage.get(), runLoop, kCFRunLoopCommonModes);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacCookieStorageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -31,11 +31,11 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> @interface WebCookieStorageObjCAdapter : NSObject {
</span><del>- CookieChangeCallbackPtr m_cookieChangeCallback;
</del><ins>+ std::function<void ()> m_cookieChangeCallback;
</ins><span class="cx"> }
</span><span class="cx"> -(void)notifyCookiesChangedOnMainThread;
</span><span class="cx"> -(void)cookiesChangedNotificationHandler:(NSNotification *)notification;
</span><del>--(void)startListeningForCookieChangeNotificationsWithCallback:(CookieChangeCallbackPtr)callback;
</del><ins>+-(void)startListeningForCookieChangeNotificationsWithCallback:(std::function<void ()>&&)callback;
</ins><span class="cx"> -(void)stopListeningForCookieChangeNotifications;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -53,10 +53,10 @@
</span><span class="cx"> [self performSelectorOnMainThread:@selector(notifyCookiesChangedOnMainThread) withObject:nil waitUntilDone:FALSE];
</span><span class="cx"> }
</span><span class="cx">
</span><del>--(void)startListeningForCookieChangeNotificationsWithCallback:(CookieChangeCallbackPtr)callback
</del><ins>+-(void)startListeningForCookieChangeNotificationsWithCallback:(std::function<void ()>&&)callback
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_cookieChangeCallback);
</span><del>- m_cookieChangeCallback = callback;
</del><ins>+ m_cookieChangeCallback = WTFMove(callback);
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cookiesChangedNotificationHandler:) name:NSHTTPCookieManagerCookiesChangedNotification object:[NSHTTPCookieStorage sharedHTTPCookieStorage]];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> -(void)stopListeningForCookieChangeNotifications
</span><span class="cx"> {
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:NSHTTPCookieManagerCookiesChangedNotification object:nil];
</span><del>- m_cookieChangeCallback = 0;
</del><ins>+ m_cookieChangeCallback = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -72,14 +72,14 @@
</span><span class="cx">
</span><span class="cx"> static WebCookieStorageObjCAdapter *cookieStorageAdapter;
</span><span class="cx">
</span><del>-void startObservingCookieChanges(CookieChangeCallbackPtr callback)
</del><ins>+void startObservingCookieChanges(const NetworkStorageSession&, std::function<void ()>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> if (!cookieStorageAdapter)
</span><span class="cx"> cookieStorageAdapter = [[WebCookieStorageObjCAdapter alloc] init];
</span><del>- [cookieStorageAdapter startListeningForCookieChangeNotificationsWithCallback:callback];
</del><ins>+ [cookieStorageAdapter startListeningForCookieChangeNotificationsWithCallback:WTFMove(callback)];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void stopObservingCookieChanges()
</del><ins>+void stopObservingCookieChanges(const NetworkStorageSession&)
</ins><span class="cx"> {
</span><span class="cx"> // cookieStorageAdapter can be nil here, if the WebProcess crashed and was restarted between
</span><span class="cx"> // when startObservingCookieChanges was called, and stopObservingCookieChanges is currently being called.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupCookieStorageSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/CookieStorageSoup.cpp (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/CookieStorageSoup.cpp 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebCore/platform/network/soup/CookieStorageSoup.cpp 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -23,30 +23,37 @@
</span><span class="cx">
</span><span class="cx"> #include "NetworkStorageSession.h"
</span><span class="cx"> #include <libsoup/soup.h>
</span><ins>+#include <wtf/HashMap.h>
+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static CookieChangeCallbackPtr cookieChangeCallback;
</del><ins>+static HashMap<SoupCookieJar*, std::function<void ()>>& cookieChangeCallbackMap()
+{
+ static NeverDestroyed<HashMap<SoupCookieJar*, std::function<void ()>>> map;
+ return map;
+}
</ins><span class="cx">
</span><span class="cx"> static void soupCookiesChanged(SoupCookieJar* jar)
</span><span class="cx"> {
</span><del>- if (jar != NetworkStorageSession::defaultStorageSession().cookieStorage())
- return;
- cookieChangeCallback();
</del><ins>+ if (auto callback = cookieChangeCallbackMap().get(jar))
+ callback();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void startObservingCookieChanges(CookieChangeCallbackPtr callback)
</del><ins>+void startObservingCookieChanges(const NetworkStorageSession& storageSession, std::function<void ()>&& callback)
</ins><span class="cx"> {
</span><del>- ASSERT(!cookieChangeCallback);
- cookieChangeCallback = callback;
-
- g_signal_connect(NetworkStorageSession::defaultStorageSession().cookieStorage(), "changed", G_CALLBACK(soupCookiesChanged), 0);
</del><ins>+ auto* jar = storageSession.cookieStorage();
+ ASSERT(!cookieChangeCallbackMap().contains(jar));
+ cookieChangeCallbackMap().add(jar, WTFMove(callback));
+ g_signal_connect(jar, "changed", G_CALLBACK(soupCookiesChanged), nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void stopObservingCookieChanges()
</del><ins>+void stopObservingCookieChanges(const NetworkStorageSession& storageSession)
</ins><span class="cx"> {
</span><del>- g_signal_handlers_disconnect_by_func(NetworkStorageSession::defaultStorageSession().cookieStorage(), reinterpret_cast<void*>(soupCookiesChanged), nullptr);
- cookieChangeCallback = nullptr;
</del><ins>+ auto* jar = storageSession.cookieStorage();
+ ASSERT(cookieChangeCallbackMap().contains(jar));
+ cookieChangeCallbackMap().remove(jar);
+ g_signal_handlers_disconnect_by_func(jar, reinterpret_cast<void*>(soupCookiesChanged), nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2017-02-14 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ CookieManager only works with the default session
+ https://bugs.webkit.org/show_bug.cgi?id=168229
+
+ Reviewed by Alex Christensen.
+
+ Make CookieManager session aware by adding a SessionID parameter to all its functions, and update all the callers
+ to pass the default session ID, preserving the current
+ behavior. WebCookieManagerProxy::startObservingCookieChanges() now also receives an optional callback to be
+ called on every change.
+
+ * UIProcess/API/C/WKCookieManager.cpp:
+ (WKCookieManagerGetHostnamesWithCookies):
+ (WKCookieManagerDeleteCookiesForHostname):
+ (WKCookieManagerDeleteAllCookies):
+ (WKCookieManagerDeleteAllCookiesModifiedAfterDate):
+ (WKCookieManagerStartObservingCookieChanges):
+ (WKCookieManagerStopObservingCookieChanges):
+ * UIProcess/API/gtk/WebKitCookieManager.cpp:
+ (_WebKitCookieManagerPrivate::~_WebKitCookieManagerPrivate):
+ (webkitCookieManagerCreate):
+ (webkit_cookie_manager_set_persistent_storage):
+ (webkit_cookie_manager_get_domains_with_cookies):
+ (webkit_cookie_manager_delete_cookies_for_domain):
+ (webkit_cookie_manager_delete_all_cookies):
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ (WebKit::WebAutomationSession::addSingleCookie):
+ (WebKit::WebAutomationSession::deleteAllCookies):
+ * UIProcess/WebCookieManagerProxy.cpp:
+ (WebKit::WebCookieManagerProxy::getHostnamesWithCookies):
+ (WebKit::WebCookieManagerProxy::deleteCookiesForHostname):
+ (WebKit::WebCookieManagerProxy::deleteAllCookies):
+ (WebKit::WebCookieManagerProxy::deleteAllCookiesModifiedSince):
+ (WebKit::WebCookieManagerProxy::addCookie):
+ (WebKit::WebCookieManagerProxy::startObservingCookieChanges):
+ (WebKit::WebCookieManagerProxy::stopObservingCookieChanges):
+ (WebKit::WebCookieManagerProxy::cookiesDidChange):
+ * UIProcess/WebCookieManagerProxy.h:
+ * UIProcess/WebCookieManagerProxy.messages.in:
+ * WebProcess/Cookies/WebCookieManager.cpp:
+ (WebKit::WebCookieManager::WebCookieManager):
+ (WebKit::WebCookieManager::getHostnamesWithCookies):
+ (WebKit::WebCookieManager::deleteCookiesForHostname):
+ (WebKit::WebCookieManager::deleteAllCookies):
+ (WebKit::WebCookieManager::deleteAllCookiesModifiedSince):
+ (WebKit::WebCookieManager::addCookie):
+ (WebKit::WebCookieManager::startObservingCookieChanges):
+ (WebKit::WebCookieManager::stopObservingCookieChanges):
+ * WebProcess/Cookies/WebCookieManager.h:
+ * WebProcess/Cookies/WebCookieManager.messages.in:
+
</ins><span class="cx"> 2017-02-14 Tomas Popela <tpopela@redhat.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix documentation typo
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -43,17 +43,17 @@
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef cookieManagerRef, void* context, WKCookieManagerGetCookieHostnamesFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(cookieManagerRef)->getHostnamesWithCookies(toGenericCallbackFunction(context, callback));
</del><ins>+ toImpl(cookieManagerRef)->getHostnamesWithCookies(WebCore::SessionID::defaultSessionID(), toGenericCallbackFunction(context, callback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef cookieManagerRef, WKStringRef hostname)
</span><span class="cx"> {
</span><del>- toImpl(cookieManagerRef)->deleteCookiesForHostname(toImpl(hostname)->string());
</del><ins>+ toImpl(cookieManagerRef)->deleteCookiesForHostname(WebCore::SessionID::defaultSessionID(), toImpl(hostname)->string());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerDeleteAllCookies(WKCookieManagerRef cookieManagerRef)
</span><span class="cx"> {
</span><del>- toImpl(cookieManagerRef)->deleteAllCookies();
</del><ins>+ toImpl(cookieManagerRef)->deleteAllCookies(WebCore::SessionID::defaultSessionID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerDeleteAllCookiesModifiedAfterDate(WKCookieManagerRef cookieManagerRef, double date)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> using namespace std::chrono;
</span><span class="cx">
</span><span class="cx"> auto time = system_clock::time_point(duration_cast<system_clock::duration>(duration<double>(date)));
</span><del>- toImpl(cookieManagerRef)->deleteAllCookiesModifiedSince(time);
</del><ins>+ toImpl(cookieManagerRef)->deleteAllCookiesModifiedSince(WebCore::SessionID::defaultSessionID(), time);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerSetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, WKHTTPCookieAcceptPolicy policy)
</span><span class="lines">@@ -76,10 +76,10 @@
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerStartObservingCookieChanges(WKCookieManagerRef cookieManager)
</span><span class="cx"> {
</span><del>- toImpl(cookieManager)->startObservingCookieChanges();
</del><ins>+ toImpl(cookieManager)->startObservingCookieChanges(WebCore::SessionID::defaultSessionID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerStopObservingCookieChanges(WKCookieManagerRef cookieManager)
</span><span class="cx"> {
</span><del>- toImpl(cookieManager)->stopObservingCookieChanges();
</del><ins>+ toImpl(cookieManager)->stopObservingCookieChanges(WebCore::SessionID::defaultSessionID());
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> struct _WebKitCookieManagerPrivate {
</span><span class="cx"> ~_WebKitCookieManagerPrivate()
</span><span class="cx"> {
</span><del>- webCookieManager->stopObservingCookieChanges();
</del><ins>+ webCookieManager->stopObservingCookieChanges(WebCore::SessionID::defaultSessionID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCookieManagerProxy> webCookieManager;
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> cookiesDidChange
</span><span class="cx"> };
</span><span class="cx"> WKCookieManagerSetClient(toAPI(webCookieManager), &wkCookieManagerClient.base);
</span><del>- manager->priv->webCookieManager->startObservingCookieChanges();
</del><ins>+ manager->priv->webCookieManager->startObservingCookieChanges(WebCore::SessionID::defaultSessionID());
</ins><span class="cx">
</span><span class="cx"> return manager;
</span><span class="cx"> }
</span><span class="lines">@@ -169,9 +169,9 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
</span><span class="cx"> g_return_if_fail(filename);
</span><span class="cx">
</span><del>- manager->priv->webCookieManager->stopObservingCookieChanges();
</del><ins>+ manager->priv->webCookieManager->stopObservingCookieChanges(WebCore::SessionID::defaultSessionID());
</ins><span class="cx"> manager->priv->webCookieManager->setCookiePersistentStorage(String::fromUTF8(filename), toSoupCookiePersistentStorageType(storage));
</span><del>- manager->priv->webCookieManager->startObservingCookieChanges();
</del><ins>+ manager->priv->webCookieManager->startObservingCookieChanges(WebCore::SessionID::defaultSessionID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
</span><span class="cx">
</span><span class="cx"> GTask* task = g_task_new(manager, cancellable, callback, userData);
</span><del>- manager->priv->webCookieManager->getHostnamesWithCookies(toGenericCallbackFunction(task, webkitCookieManagerGetDomainsWithCookiesCallback));
</del><ins>+ manager->priv->webCookieManager->getHostnamesWithCookies(WebCore::SessionID::defaultSessionID(), toGenericCallbackFunction(task, webkitCookieManagerGetDomainsWithCookiesCallback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
</span><span class="cx"> g_return_if_fail(domain);
</span><span class="cx">
</span><del>- manager->priv->webCookieManager->deleteCookiesForHostname(String::fromUTF8(domain));
</del><ins>+ manager->priv->webCookieManager->deleteCookiesForHostname(WebCore::SessionID::defaultSessionID(), String::fromUTF8(domain));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -318,5 +318,5 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
</span><span class="cx">
</span><del>- manager->priv->webCookieManager->deleteAllCookies();
</del><ins>+ manager->priv->webCookieManager->deleteAllCookies(WebCore::SessionID::defaultSessionID());
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationWebAutomationSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR_AND_DETAILS(MissingParameter, "The parameter 'httpOnly' was not found.");
</span><span class="cx">
</span><span class="cx"> WebCookieManagerProxy* cookieManager = m_processPool->supplement<WebCookieManagerProxy>();
</span><del>- cookieManager->addCookie(cookie, activeURL.host());
</del><ins>+ cookieManager->addCookie(WebCore::SessionID::defaultSessionID(), cookie, activeURL.host());
</ins><span class="cx">
</span><span class="cx"> callback->sendSuccess();
</span><span class="cx"> }
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx"> ASSERT(activeURL.isValid());
</span><span class="cx">
</span><span class="cx"> WebCookieManagerProxy* cookieManager = m_processPool->supplement<WebCookieManagerProxy>();
</span><del>- cookieManager->deleteCookiesForHostname(activeURL.host());
</del><ins>+ cookieManager->deleteCookiesForHostname(WebCore::SessionID::defaultSessionID(), activeURL.host());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -93,15 +93,15 @@
</span><span class="cx"> API::Object::deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::getHostnamesWithCookies(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebCookieManagerProxy::getHostnamesWithCookies(WebCore::SessionID sessionID, std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> auto callback = ArrayCallback::create(WTFMove(callbackFunction));
</span><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><span class="cx"> m_arrayCallbacks.set(callbackID, WTFMove(callback));
</span><span class="cx">
</span><del>- processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::GetHostnamesWithCookies(callbackID));
</del><ins>+ processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::GetHostnamesWithCookies(sessionID, callbackID));
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void WebCookieManagerProxy::didGetHostnamesWithCookies(const Vector<String>& hostnames, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ArrayCallback> callback = m_arrayCallbacks.take(callbackID);
</span><span class="lines">@@ -113,39 +113,44 @@
</span><span class="cx"> callback->performCallbackWithReturnValue(API::Array::createStringArray(hostnames).ptr());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::deleteCookiesForHostname(const String& hostname)
</del><ins>+void WebCookieManagerProxy::deleteCookiesForHostname(WebCore::SessionID sessionID, const String& hostname)
</ins><span class="cx"> {
</span><del>- processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::DeleteCookiesForHostname(hostname));
</del><ins>+ processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::DeleteCookiesForHostname(sessionID, hostname));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::deleteAllCookies()
</del><ins>+void WebCookieManagerProxy::deleteAllCookies(WebCore::SessionID sessionID)
</ins><span class="cx"> {
</span><del>- processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::DeleteAllCookies());
</del><ins>+ processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::DeleteAllCookies(sessionID));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::deleteAllCookiesModifiedSince(std::chrono::system_clock::time_point time)
</del><ins>+void WebCookieManagerProxy::deleteAllCookiesModifiedSince(WebCore::SessionID sessionID, std::chrono::system_clock::time_point time)
</ins><span class="cx"> {
</span><del>- processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::DeleteAllCookiesModifiedSince(time));
</del><ins>+ processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::DeleteAllCookiesModifiedSince(sessionID, time));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::addCookie(const WebCore::Cookie& cookie, const String& hostname)
</del><ins>+void WebCookieManagerProxy::addCookie(WebCore::SessionID sessionID, const WebCore::Cookie& cookie, const String& hostname)
</ins><span class="cx"> {
</span><del>- processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::AddCookie(cookie, hostname));
</del><ins>+ processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::AddCookie(sessionID, cookie, hostname));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::startObservingCookieChanges()
</del><ins>+void WebCookieManagerProxy::startObservingCookieChanges(WebCore::SessionID sessionID, std::function<void ()>&& callback)
</ins><span class="cx"> {
</span><del>- processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::StartObservingCookieChanges());
</del><ins>+ if (callback)
+ m_cookieObservers.set(sessionID, WTFMove(callback));
+ processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::StartObservingCookieChanges(sessionID));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::stopObservingCookieChanges()
</del><ins>+void WebCookieManagerProxy::stopObservingCookieChanges(WebCore::SessionID sessionID)
</ins><span class="cx"> {
</span><del>- processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::StopObservingCookieChanges());
</del><ins>+ m_cookieObservers.remove(sessionID);
+ processPool()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::StopObservingCookieChanges(sessionID));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::cookiesDidChange()
</del><ins>+void WebCookieManagerProxy::cookiesDidChange(WebCore::SessionID sessionID)
</ins><span class="cx"> {
</span><span class="cx"> m_client.cookiesDidChange(this);
</span><ins>+ if (auto callback = m_cookieObservers.get(sessionID))
+ callback();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebCookieManagerProxy::setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include "WebContextSupplement.h"
</span><span class="cx"> #include "WebCookieManagerProxyClient.h"
</span><ins>+#include <WebCore/SessionID.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -64,17 +65,17 @@
</span><span class="cx">
</span><span class="cx"> void initializeClient(const WKCookieManagerClientBase*);
</span><span class="cx">
</span><del>- void getHostnamesWithCookies(std::function<void (API::Array*, CallbackBase::Error)>);
- void deleteCookiesForHostname(const String& hostname);
- void deleteAllCookies();
- void deleteAllCookiesModifiedSince(std::chrono::system_clock::time_point);
- void addCookie(const WebCore::Cookie&, const String& hostname);
</del><ins>+ void getHostnamesWithCookies(WebCore::SessionID, std::function<void (API::Array*, CallbackBase::Error)>);
+ void deleteCookiesForHostname(WebCore::SessionID, const String& hostname);
+ void deleteAllCookies(WebCore::SessionID);
+ void deleteAllCookiesModifiedSince(WebCore::SessionID, std::chrono::system_clock::time_point);
+ void addCookie(WebCore::SessionID, const WebCore::Cookie&, const String& hostname);
</ins><span class="cx">
</span><span class="cx"> void setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
</span><span class="cx"> void getHTTPCookieAcceptPolicy(std::function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)>);
</span><span class="cx">
</span><del>- void startObservingCookieChanges();
- void stopObservingCookieChanges();
</del><ins>+ void startObservingCookieChanges(WebCore::SessionID, std::function<void ()>&& = nullptr);
+ void stopObservingCookieChanges(WebCore::SessionID);
</ins><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> void setCookiePersistentStorage(const String& storagePath, uint32_t storageType);
</span><span class="lines">@@ -90,7 +91,7 @@
</span><span class="cx"> void didGetHostnamesWithCookies(const Vector<String>&, uint64_t callbackID);
</span><span class="cx"> void didGetHTTPCookieAcceptPolicy(uint32_t policy, uint64_t callbackID);
</span><span class="cx">
</span><del>- void cookiesDidChange();
</del><ins>+ void cookiesDidChange(WebCore::SessionID);
</ins><span class="cx">
</span><span class="cx"> // WebContextSupplement
</span><span class="cx"> void processPoolDestroyed() override;
</span><span class="lines">@@ -109,6 +110,8 @@
</span><span class="cx"> HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
</span><span class="cx"> HashMap<uint64_t, RefPtr<HTTPCookieAcceptPolicyCallback>> m_httpCookieAcceptPolicyCallbacks;
</span><span class="cx">
</span><ins>+ HashMap<WebCore::SessionID, std::function<void ()>> m_cookieObservers;
+
</ins><span class="cx"> WebCookieManagerProxyClient m_client;
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.messages.in (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.messages.in 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.messages.in 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -24,5 +24,5 @@
</span><span class="cx"> DidGetHostnamesWithCookies(Vector<String> hostnames, uint64_t callbackID);
</span><span class="cx"> DidGetHTTPCookieAcceptPolicy(uint32_t policy, uint64_t callbackID);
</span><span class="cx">
</span><del>- CookiesDidChange()
</del><ins>+ CookiesDidChange(WebCore::SessionID sessionID)
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessCookiesWebCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -42,8 +42,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static WebCookieManager* sharedCookieManager;
-
</del><span class="cx"> const char* WebCookieManager::supplementName()
</span><span class="cx"> {
</span><span class="cx"> return "WebCookieManager";
</span><span class="lines">@@ -53,15 +51,13 @@
</span><span class="cx"> : m_process(process)
</span><span class="cx"> {
</span><span class="cx"> m_process->addMessageReceiver(Messages::WebCookieManager::messageReceiverName(), *this);
</span><del>-
- ASSERT(!sharedCookieManager);
- sharedCookieManager = this;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManager::getHostnamesWithCookies(uint64_t callbackID)
</del><ins>+void WebCookieManager::getHostnamesWithCookies(SessionID sessionID, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> HashSet<String> hostnames;
</span><del>- WebCore::getHostnamesWithCookies(NetworkStorageSession::defaultStorageSession(), hostnames);
</del><ins>+ if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
+ WebCore::getHostnamesWithCookies(*storageSession, hostnames);
</ins><span class="cx">
</span><span class="cx"> Vector<String> hostnameList;
</span><span class="cx"> copyToVector(hostnames, hostnameList);
</span><span class="lines">@@ -69,47 +65,46 @@
</span><span class="cx"> m_process->send(Messages::WebCookieManagerProxy::DidGetHostnamesWithCookies(hostnameList, callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManager::deleteCookiesForHostname(const String& hostname)
</del><ins>+void WebCookieManager::deleteCookiesForHostname(SessionID sessionID, const String& hostname)
</ins><span class="cx"> {
</span><del>- WebCore::deleteCookiesForHostnames(NetworkStorageSession::defaultStorageSession(), { hostname });
</del><ins>+ if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
+ WebCore::deleteCookiesForHostnames(*storageSession, { hostname });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManager::deleteAllCookies()
</del><ins>+void WebCookieManager::deleteAllCookies(SessionID sessionID)
</ins><span class="cx"> {
</span><del>- WebCore::deleteAllCookies(NetworkStorageSession::defaultStorageSession());
</del><ins>+ if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
+ WebCore::deleteAllCookies(*storageSession);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManager::deleteAllCookiesModifiedSince(std::chrono::system_clock::time_point time)
</del><ins>+void WebCookieManager::deleteAllCookiesModifiedSince(SessionID sessionID, std::chrono::system_clock::time_point time)
</ins><span class="cx"> {
</span><del>- WebCore::deleteAllCookiesModifiedSince(NetworkStorageSession::defaultStorageSession(), time);
</del><ins>+ if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
+ WebCore::deleteAllCookiesModifiedSince(*storageSession, time);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManager::addCookie(const Cookie& cookie, const String& hostname)
</del><ins>+void WebCookieManager::addCookie(SessionID sessionID, const Cookie& cookie, const String& hostname)
</ins><span class="cx"> {
</span><del>- WebCore::addCookie(NetworkStorageSession::defaultStorageSession(), URL(URL(), hostname), cookie);
</del><ins>+ if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
+ WebCore::addCookie(*storageSession, URL(URL(), hostname), cookie);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManager::startObservingCookieChanges()
</del><ins>+void WebCookieManager::startObservingCookieChanges(SessionID sessionID)
</ins><span class="cx"> {
</span><del>- WebCore::startObservingCookieChanges(cookiesDidChange);
</del><ins>+ if (auto* storageSession = NetworkStorageSession::storageSession(sessionID)) {
+ WebCore::startObservingCookieChanges(*storageSession, [this, sessionID] {
+ ASSERT(RunLoop::isMain());
+ m_process->send(Messages::WebCookieManagerProxy::CookiesDidChange(sessionID), 0);
+ });
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManager::stopObservingCookieChanges()
</del><ins>+void WebCookieManager::stopObservingCookieChanges(SessionID sessionID)
</ins><span class="cx"> {
</span><del>- WebCore::stopObservingCookieChanges();
</del><ins>+ if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
+ WebCore::stopObservingCookieChanges(*storageSession);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManager::cookiesDidChange()
-{
- sharedCookieManager->dispatchCookiesDidChange();
-}
-
-void WebCookieManager::dispatchCookiesDidChange()
-{
- ASSERT(RunLoop::isMain());
- m_process->send(Messages::WebCookieManagerProxy::CookiesDidChange(), 0);
-}
-
</del><span class="cx"> void WebCookieManager::setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
</span><span class="cx"> {
</span><span class="cx"> platformSetHTTPCookieAcceptPolicy(policy);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessCookiesWebCookieManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include "NetworkProcessSupplement.h"
</span><span class="cx"> #include "WebProcessSupplement.h"
</span><ins>+#include <WebCore/SessionID.h>
</ins><span class="cx"> #include <stdint.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="lines">@@ -62,23 +63,19 @@
</span><span class="cx"> // IPC::MessageReceiver
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</span><span class="cx">
</span><del>- void getHostnamesWithCookies(uint64_t callbackID);
- void deleteCookiesForHostname(const String&);
- void deleteAllCookies();
- void deleteAllCookiesModifiedSince(std::chrono::system_clock::time_point);
- void addCookie(const WebCore::Cookie&, const String& hostname);
</del><ins>+ void getHostnamesWithCookies(WebCore::SessionID, uint64_t callbackID);
+ void deleteCookiesForHostname(WebCore::SessionID, const String&);
+ void deleteAllCookies(WebCore::SessionID);
+ void deleteAllCookiesModifiedSince(WebCore::SessionID, std::chrono::system_clock::time_point);
+ void addCookie(WebCore::SessionID, const WebCore::Cookie&, const String& hostname);
</ins><span class="cx">
</span><span class="cx"> void platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
</span><span class="cx"> void getHTTPCookieAcceptPolicy(uint64_t callbackID);
</span><span class="cx"> HTTPCookieAcceptPolicy platformGetHTTPCookieAcceptPolicy();
</span><span class="cx">
</span><del>- void startObservingCookieChanges();
- void stopObservingCookieChanges();
</del><ins>+ void startObservingCookieChanges(WebCore::SessionID);
+ void stopObservingCookieChanges(WebCore::SessionID);
</ins><span class="cx">
</span><del>- static void cookiesDidChange();
- void dispatchCookiesDidChange();
-
-
</del><span class="cx"> ChildProcess* m_process;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessCookiesWebCookieManagermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.messages.in (212282 => 212283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.messages.in 2017-02-14 10:09:10 UTC (rev 212282)
+++ trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.messages.in 2017-02-14 10:43:14 UTC (rev 212283)
</span><span class="lines">@@ -24,17 +24,17 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> messages -> WebCookieManager {
</span><del>- void GetHostnamesWithCookies(uint64_t callbackID)
- void DeleteCookiesForHostname(String hostname)
- void DeleteAllCookies()
- void DeleteAllCookiesModifiedSince(std::chrono::system_clock::time_point time)
- void AddCookie(struct WebCore::Cookie cookie, String hostname)
</del><ins>+ void GetHostnamesWithCookies(WebCore::SessionID sessionID, uint64_t callbackID)
+ void DeleteCookiesForHostname(WebCore::SessionID sessionID, String hostname)
+ void DeleteAllCookies(WebCore::SessionID sessionID)
+ void DeleteAllCookiesModifiedSince(WebCore::SessionID sessionID, std::chrono::system_clock::time_point time)
+ void AddCookie(WebCore::SessionID sessionID, struct WebCore::Cookie cookie, String hostname)
</ins><span class="cx">
</span><span class="cx"> void SetHTTPCookieAcceptPolicy(uint32_t policy)
</span><span class="cx"> void GetHTTPCookieAcceptPolicy(uint64_t callbackID)
</span><span class="cx">
</span><del>- void StartObservingCookieChanges()
- void StopObservingCookieChanges()
</del><ins>+ void StartObservingCookieChanges(WebCore::SessionID sessionID)
+ void StopObservingCookieChanges(WebCore::SessionID sessionID)
</ins><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> SetCookiePersistentStorage(String storagePath, uint32_t storageType)
</span></span></pre>
</div>
</div>
</body>
</html>