<!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>[281801] 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/281801">281801</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-08-31 07:19:28 -0700 (Tue, 31 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[SOUP] Assertion in startObservingCookieChanges()
https://bugs.webkit.org/show_bug.cgi?id=229708

Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2021-08-31
Reviewed by Philippe Normand.

Source/WebCore:

Add an implementation for startObservingCookieChanges() and stopObservingCookieChanges() setting the cookies
observer callback on the given storage session.

* platform/network/CookieStorage.h:
* platform/network/cf/CookieStorageCFNet.cpp:
(WebCore::startObservingCookieChanges):
(WebCore::stopObservingCookieChanges):
* platform/network/curl/CookieStorageCurl.cpp:
(WebCore::startObservingCookieChanges):
(WebCore::stopObservingCookieChanges):
* platform/network/mac/CookieStorageMac.mm:
(WebCore::startObservingCookieChanges):
(WebCore::stopObservingCookieChanges):
* platform/network/soup/CookieStorageSoup.cpp:
(WebCore::startObservingCookieChanges):
(WebCore::stopObservingCookieChanges):

Source/WebKit:

Do not observe cookies changes unconditionally on session creation/destruction.

* NetworkProcess/soup/NetworkSessionSoup.cpp:
(WebKit::NetworkSessionSoup::NetworkSessionSoup):
(WebKit::NetworkSessionSoup::~NetworkSessionSoup):</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="#trunkSourceWebCoreplatformnetworkcurlCookieStorageCurlcpp">trunk/Source/WebCore/platform/network/curl/CookieStorageCurl.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="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesssoupNetworkSessionSoupcpp">trunk/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (281800 => 281801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-31 13:47:17 UTC (rev 281800)
+++ trunk/Source/WebCore/ChangeLog      2021-08-31 14:19:28 UTC (rev 281801)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2021-08-31  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Assertion in startObservingCookieChanges()
+        https://bugs.webkit.org/show_bug.cgi?id=229708
+
+        Reviewed by Philippe Normand.
+
+        Add an implementation for startObservingCookieChanges() and stopObservingCookieChanges() setting the cookies
+        observer callback on the given storage session.
+
+        * platform/network/CookieStorage.h:
+        * platform/network/cf/CookieStorageCFNet.cpp:
+        (WebCore::startObservingCookieChanges):
+        (WebCore::stopObservingCookieChanges):
+        * platform/network/curl/CookieStorageCurl.cpp:
+        (WebCore::startObservingCookieChanges):
+        (WebCore::stopObservingCookieChanges):
+        * platform/network/mac/CookieStorageMac.mm:
+        (WebCore::startObservingCookieChanges):
+        (WebCore::stopObservingCookieChanges):
+        * platform/network/soup/CookieStorageSoup.cpp:
+        (WebCore::startObservingCookieChanges):
+        (WebCore::stopObservingCookieChanges):
+
</ins><span class="cx"> 2021-08-31  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [LFC][Integration] Make naming more consistent across Layout::Run and Integration::Run structs
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCookieStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CookieStorage.h (281800 => 281801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CookieStorage.h    2021-08-31 13:47:17 UTC (rev 281800)
+++ trunk/Source/WebCore/platform/network/CookieStorage.h       2021-08-31 14:19:28 UTC (rev 281801)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> 
</span><span class="cx"> class NetworkStorageSession;
</span><span class="cx"> 
</span><del>-WEBCORE_EXPORT void startObservingCookieChanges(const NetworkStorageSession&, WTF::Function<void ()>&&);
-WEBCORE_EXPORT void stopObservingCookieChanges(const NetworkStorageSession&);
</del><ins>+WEBCORE_EXPORT void startObservingCookieChanges(NetworkStorageSession&, WTF::Function<void()>&&);
+WEBCORE_EXPORT void stopObservingCookieChanges(NetworkStorageSession&);
</ins><span class="cx"> 
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCookieStorageCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp (281800 => 281801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp  2021-08-31 13:47:17 UTC (rev 281800)
+++ trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp     2021-08-31 14:19:28 UTC (rev 281801)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">     return loaderRunLoop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void startObservingCookieChanges(const NetworkStorageSession& storageSession, WTF::Function<void ()>&& callback)
</del><ins>+void startObservingCookieChanges(NetworkStorageSession& storageSession, WTF::Function<void()>&& callback)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><span class="cx"> 
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">     CFHTTPCookieStorageAddObserver(cookieStorage.get(), runLoop, kCFRunLoopDefaultMode, notifyCookiesChanged, 0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void stopObservingCookieChanges(const NetworkStorageSession& storageSession)
</del><ins>+void stopObservingCookieChanges(NetworkStorageSession& storageSession)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCookieStorageCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CookieStorageCurl.cpp (281800 => 281801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CookieStorageCurl.cpp 2021-08-31 13:47:17 UTC (rev 281800)
+++ trunk/Source/WebCore/platform/network/curl/CookieStorageCurl.cpp    2021-08-31 14:19:28 UTC (rev 281801)
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-void startObservingCookieChanges(const NetworkStorageSession&, WTF::Function<void()>&&)
</del><ins>+void startObservingCookieChanges(NetworkStorageSession&, WTF::Function<void()>&&)
</ins><span class="cx"> {
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void stopObservingCookieChanges(const NetworkStorageSession&)
</del><ins>+void stopObservingCookieChanges(NetworkStorageSession&)
</ins><span class="cx"> {
</span><span class="cx">     notImplemented();
</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 (281800 => 281801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm    2021-08-31 13:47:17 UTC (rev 281800)
+++ trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm       2021-08-31 14:19:28 UTC (rev 281801)
</span><span class="lines">@@ -31,12 +31,12 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-void startObservingCookieChanges(const NetworkStorageSession& storageSession, WTF::Function<void()>&& callback)
</del><ins>+void startObservingCookieChanges(NetworkStorageSession& storageSession, WTF::Function<void()>&& callback)
</ins><span class="cx"> {
</span><span class="cx">     storageSession.cookieStorageObserver().startObserving(WTFMove(callback));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void stopObservingCookieChanges(const NetworkStorageSession& storageSession)
</del><ins>+void stopObservingCookieChanges(NetworkStorageSession& storageSession)
</ins><span class="cx"> {
</span><span class="cx">     storageSession.cookieStorageObserver().stopObserving();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupCookieStorageSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/CookieStorageSoup.cpp (281800 => 281801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/CookieStorageSoup.cpp 2021-08-31 13:47:17 UTC (rev 281800)
+++ trunk/Source/WebCore/platform/network/soup/CookieStorageSoup.cpp    2021-08-31 14:19:28 UTC (rev 281801)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- *  Copyright (C) 2012 Igalia S.L.
</del><ins>+ *  Copyright (C) 2021 Igalia S.L.
</ins><span class="cx">  *
</span><span class="cx">  *  This library is free software; you can redistribute it and/or
</span><span class="cx">  *  modify it under the terms of the GNU Lesser General Public
</span><span class="lines">@@ -20,19 +20,20 @@
</span><span class="cx"> #include "CookieStorage.h"
</span><span class="cx"> 
</span><span class="cx"> #if USE(SOUP)
</span><ins>+#include "NetworkStorageSession.h"
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-void startObservingCookieChanges(const NetworkStorageSession&, WTF::Function<void ()>&&)
</del><ins>+void startObservingCookieChanges(NetworkStorageSession& storageSession, Function<void()>&& callback)
</ins><span class="cx"> {
</span><del>-    ASSERT_NOT_REACHED();
</del><ins>+    storageSession.setCookieObserverHandler(WTFMove(callback));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void stopObservingCookieChanges(const NetworkStorageSession&)
</del><ins>+void stopObservingCookieChanges(NetworkStorageSession& storageSession)
</ins><span class="cx"> {
</span><del>-    ASSERT_NOT_REACHED();
</del><ins>+    storageSession.setCookieObserverHandler(nullptr);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-}
</del><ins>+} // namespace WebCore
</ins><span class="cx"> 
</span><del>-#endif
</del><ins>+#endif // USE(SOUP)
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (281800 => 281801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-08-31 13:47:17 UTC (rev 281800)
+++ trunk/Source/WebKit/ChangeLog       2021-08-31 14:19:28 UTC (rev 281801)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-08-31  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Assertion in startObservingCookieChanges()
+        https://bugs.webkit.org/show_bug.cgi?id=229708
+
+        Reviewed by Philippe Normand.
+
+        Do not observe cookies changes unconditionally on session creation/destruction.
+
+        * NetworkProcess/soup/NetworkSessionSoup.cpp:
+        (WebKit::NetworkSessionSoup::NetworkSessionSoup):
+        (WebKit::NetworkSessionSoup::~NetworkSessionSoup):
+
</ins><span class="cx"> 2021-08-31  Myles C. Maxfield  <mmaxfield@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Drawing system fallback fonts to canvas causes a crash
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesssoupNetworkSessionSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp (281800 => 281801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp   2021-08-31 13:47:17 UTC (rev 281800)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp      2021-08-31 14:19:28 UTC (rev 281801)
</span><span class="lines">@@ -59,10 +59,6 @@
</span><span class="cx">     else
</span><span class="cx">         m_networkSession->setCookieJar(storageSession->cookieStorage());
</span><span class="cx"> 
</span><del>-    storageSession->setCookieObserverHandler([this] {
-        this->networkProcess().supplement<WebCookieManager>()->notifyCookiesDidChange(m_sessionID);
-    });
-
</del><span class="cx">     if (!parameters.hstsStorageDirectory.isEmpty())
</span><span class="cx">         m_networkSession->setHSTSPersistentStorage(parameters.hstsStorageDirectory);
</span><span class="cx"> }
</span><span class="lines">@@ -69,8 +65,6 @@
</span><span class="cx"> 
</span><span class="cx"> NetworkSessionSoup::~NetworkSessionSoup()
</span><span class="cx"> {
</span><del>-    if (auto* storageSession = networkProcess().storageSession(m_sessionID))
-        storageSession->setCookieObserverHandler(nullptr);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> SoupSession* NetworkSessionSoup::soupSession() const
</span></span></pre>
</div>
</div>

</body>
</html>