<!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>[187643] branches/safari-601.1-branch/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/187643">187643</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-07-31 08:58:51 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187375">r187375</a>. rdar://problem/21948230</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreplatformnetworkPlatformCookieJarh">branches/safari-601.1-branch/Source/WebCore/platform/network/PlatformCookieJar.h</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreplatformnetworkcfCookieJarCFNetcpp">branches/safari-601.1-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreplatformnetworkmacCookieJarMacmm">branches/safari-601.1-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreplatformnetworksoupCookieJarSoupcpp">branches/safari-601.1-branch/Source/WebCore/platform/network/soup/CookieJarSoup.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreplatformspicfCFNetworkSPIh">branches/safari-601.1-branch/Source/WebCore/platform/spi/cf/CFNetworkSPI.h</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2ChangeLog">branches/safari-601.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2NetworkProcessNetworkProcesscpp">branches/safari-601.1-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2WebProcessCookiesWebCookieManagercpp">branches/safari-601.1-branch/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187642 => 187643)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-31 14:28:37 UTC (rev 187642)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-31 15:58:51 UTC (rev 187643)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-07-31 Lucas Forschler <lforschler@apple.com>
+
+ Merge r187375
+
+ 2015-07-24 Anders Carlsson <andersca@apple.com>
+
+ WKWebsiteDataStore remove methods don't properly delete cookies
+ https://bugs.webkit.org/show_bug.cgi?id=147282
+ rdar://problem/21948230
+
+ Reviewed by Sam Weinig.
+
+ Rename deleteCookiesForHostname to deleteCookiesForHostnames and
+ make it take a vector of hostnames instead.
+
+ Also, fix the Mac implementation to not be O(n2) by putting all cookies
+ in a dictionary keyed on the domain.
+
+ Also make sure to call _saveStorage after deleting cookies.
+
+ Finally, get rid of deleteCookiesForHostname from CookieJarCFNet.cpp and
+ use the Mac implementation on iOS as well. Just stub out deleteCookiesForHostnames
+ on Windows since nobody is calling it.
+
+ * platform/network/PlatformCookieJar.h:
+ * platform/network/cf/CookieJarCFNet.cpp:
+ (WebCore::deleteCookiesForHostnames):
+ (WebCore::deleteCookiesForHostname): Deleted.
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::deleteCookiesForHostnames):
+ (WebCore::deleteAllCookiesModifiedSince):
+ (WebCore::deleteCookiesForHostname): Deleted.
+ * platform/network/soup/CookieJarSoup.cpp:
+ (WebCore::deleteCookiesForHostnames):
+ (WebCore::deleteCookiesForHostname): Deleted.
+ * platform/spi/cf/CFNetworkSPI.h:
+
</ins><span class="cx"> 2015-07-30 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r187490. rdar://problem/21995928
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreplatformnetworkPlatformCookieJarh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/platform/network/PlatformCookieJar.h (187642 => 187643)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/platform/network/PlatformCookieJar.h 2015-07-31 14:28:37 UTC (rev 187642)
+++ branches/safari-601.1-branch/Source/WebCore/platform/network/PlatformCookieJar.h 2015-07-31 15:58:51 UTC (rev 187643)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> WEBCORE_EXPORT bool getRawCookies(const NetworkStorageSession&, const URL& firstParty, const URL&, Vector<Cookie>&);
</span><span class="cx"> WEBCORE_EXPORT void deleteCookie(const NetworkStorageSession&, const URL&, const String&);
</span><span class="cx"> WEBCORE_EXPORT void getHostnamesWithCookies(const NetworkStorageSession&, HashSet<String>& hostnames);
</span><del>-WEBCORE_EXPORT void deleteCookiesForHostname(const NetworkStorageSession&, const String& hostname);
</del><ins>+WEBCORE_EXPORT void deleteCookiesForHostnames(const NetworkStorageSession&, const Vector<String>& cookieHostNames);
</ins><span class="cx"> WEBCORE_EXPORT void deleteAllCookies(const NetworkStorageSession&);
</span><span class="cx"> WEBCORE_EXPORT void deleteAllCookiesModifiedSince(const NetworkStorageSession&, std::chrono::system_clock::time_point);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreplatformnetworkcfCookieJarCFNetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (187642 => 187643)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-31 14:28:37 UTC (rev 187642)
+++ branches/safari-601.1-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-31 15:58:51 UTC (rev 187643)
</span><span class="lines">@@ -230,29 +230,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void deleteCookiesForHostname(const NetworkStorageSession& session, const String& hostname)
-{
- RetainPtr<CFHTTPCookieStorageRef> cookieStorage = session.cookieStorage();
-
- RetainPtr<CFArrayRef> cookiesCF = adoptCF(CFHTTPCookieStorageCopyCookies(cookieStorage.get()));
- if (!cookiesCF)
- return;
-
- CFIndex count = CFArrayGetCount(cookiesCF.get());
- for (CFIndex i = count - 1; i >=0; i--) {
- CFHTTPCookieRef cookie = static_cast<CFHTTPCookieRef>(const_cast<void *>(CFArrayGetValueAtIndex(cookiesCF.get(), i)));
- RetainPtr<CFStringRef> domain = cookieDomain(cookie);
- if (String(domain.get()) == hostname)
- CFHTTPCookieStorageDeleteCookie(cookieStorage.get(), cookie);
- }
-}
-
</del><span class="cx"> void deleteAllCookies(const NetworkStorageSession& session)
</span><span class="cx"> {
</span><span class="cx"> CFHTTPCookieStorageDeleteAllCookies(session.cookieStorage().get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><ins>+void deleteCookiesForHostnames(const NetworkStorageSession& session, const Vector<String>& hostnames)
+{
+}
+
</ins><span class="cx"> void deleteAllCookiesModifiedSince(const NetworkStorageSession&, std::chrono::system_clock::time_point)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreplatformnetworkmacCookieJarMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm (187642 => 187643)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm 2015-07-31 14:28:37 UTC (rev 187642)
+++ branches/safari-601.1-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm 2015-07-31 15:58:51 UTC (rev 187643)
</span><span class="lines">@@ -198,23 +198,6 @@
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void deleteCookiesForHostname(const NetworkStorageSession& session, const String& hostname)
-{
- BEGIN_BLOCK_OBJC_EXCEPTIONS;
-
- RetainPtr<CFHTTPCookieStorageRef> cookieStorage = session.cookieStorage();
- NSArray *cookies = wkHTTPCookies(cookieStorage.get());
- if (!cookies)
- return;
-
- for (NSHTTPCookie* cookie in cookies) {
- if (hostname == String([cookie domain]))
- wkDeleteHTTPCookie(cookieStorage.get(), cookie);
- }
-
- END_BLOCK_OBJC_EXCEPTIONS;
-}
-
</del><span class="cx"> void deleteAllCookies(const NetworkStorageSession& session)
</span><span class="cx"> {
</span><span class="cx"> wkDeleteAllHTTPCookies(session.cookieStorage().get());
</span><span class="lines">@@ -235,6 +218,30 @@
</span><span class="cx"> return [[[NSHTTPCookieStorage alloc] _initWithCFHTTPCookieStorage:cookieStorage.get()] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void deleteCookiesForHostnames(const NetworkStorageSession& session, const Vector<String>& hostnames)
+{
+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
+ RetainPtr<CFHTTPCookieStorageRef> cookieStorage = session.cookieStorage();
+ NSArray *cookies = wkHTTPCookies(cookieStorage.get());
+ if (!cookies)
+ return;
+
+ HashMap<String, RetainPtr<NSHTTPCookie>> cookiesByDomain;
+ for (NSHTTPCookie* cookie in cookies)
+ cookiesByDomain.set(cookie.domain, cookie);
+
+ for (const auto& hostname : hostnames) {
+ if (NSHTTPCookie *cookie = cookiesByDomain.get(hostname).get())
+ wkDeleteHTTPCookie(cookieStorage.get(), cookie);
+ }
+
+ [WebCore::cookieStorage(session) _saveCookies];
+
+ END_BLOCK_OBJC_EXCEPTIONS;
+}
+
+
</ins><span class="cx"> void deleteAllCookiesModifiedSince(const NetworkStorageSession& session, std::chrono::system_clock::time_point timePoint)
</span><span class="cx"> {
</span><span class="cx"> if (![NSHTTPCookieStorage instancesRespondToSelector:@selector(removeCookiesSinceDate:)])
</span><span class="lines">@@ -243,7 +250,10 @@
</span><span class="cx"> NSTimeInterval timeInterval = std::chrono::duration_cast<std::chrono::duration<double>>(timePoint.time_since_epoch()).count();
</span><span class="cx"> NSDate *date = [NSDate dateWithTimeIntervalSince1970:timeInterval];
</span><span class="cx">
</span><del>- [cookieStorage(session) removeCookiesSinceDate:date];
</del><ins>+ NSHTTPCookieStorage *storage = cookieStorage(session);
+
+ [storage removeCookiesSinceDate:date];
+ [storage _saveCookies];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreplatformnetworksoupCookieJarSoupcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/platform/network/soup/CookieJarSoup.cpp (187642 => 187643)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2015-07-31 14:28:37 UTC (rev 187642)
+++ branches/safari-601.1-branch/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2015-07-31 15:58:51 UTC (rev 187643)
</span><span class="lines">@@ -203,16 +203,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void deleteCookiesForHostname(const NetworkStorageSession& session, const String& hostname)
</del><ins>+void deleteCookiesForHostnames(const NetworkStorageSession& session, const Vector<String>& hostnames)
</ins><span class="cx"> {
</span><del>- CString hostNameString = hostname.utf8();
- SoupCookieJar* cookieJar = cookieJarForSession(session);
- GUniquePtr<GSList> cookies(soup_cookie_jar_all_cookies(cookieJar));
- for (GSList* item = cookies.get(); item; item = g_slist_next(item)) {
- SoupCookie* cookie = static_cast<SoupCookie*>(item->data);
- if (soup_cookie_domain_matches(cookie, hostNameString.data()))
- soup_cookie_jar_delete_cookie(cookieJar, cookie);
- soup_cookie_free(cookie);
</del><ins>+ for (const auto& hostname : hostnames) {
+ CString hostNameString = hostname.utf8();
+ SoupCookieJar* cookieJar = cookieJarForSession(session);
+ GUniquePtr<GSList> cookies(soup_cookie_jar_all_cookies(cookieJar));
+ for (GSList* item = cookies.get(); item; item = g_slist_next(item)) {
+ SoupCookie* cookie = static_cast<SoupCookie*>(item->data);
+ if (soup_cookie_domain_matches(cookie, hostNameString.data()))
+ soup_cookie_jar_delete_cookie(cookieJar, cookie);
+ soup_cookie_free(cookie);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreplatformspicfCFNetworkSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (187642 => 187643)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-07-31 14:28:37 UTC (rev 187642)
+++ branches/safari-601.1-branch/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-07-31 15:58:51 UTC (rev 187643)
</span><span class="lines">@@ -128,13 +128,16 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if defined(__OBJC__)
</span><ins>+
</ins><span class="cx"> #if !USE(APPLE_INTERNAL_SDK) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1090)
</span><span class="cx"> @interface NSHTTPCookieStorage (Details)
</span><span class="cx"> - (void)removeCookiesSinceDate:(NSDate *)date;
</span><span class="cx"> - (id)_initWithCFHTTPCookieStorage:(CFHTTPCookieStorageRef)cfStorage;
</span><span class="cx"> - (CFHTTPCookieStorageRef)_cookieStorage;
</span><ins>+- (void)_saveCookies;
</ins><span class="cx"> @end
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> // FIXME: Move +_setSharedHTTPCookieStorage: into the above section under !USE(APPLE_INTERNAL_SDK) when possible (soon).
</span><span class="cx"> #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</span><span class="cx"> @interface NSHTTPCookieStorage (Details)
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187642 => 187643)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-31 14:28:37 UTC (rev 187642)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-31 15:58:51 UTC (rev 187643)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-07-31 Lucas Forschler <lforschler@apple.com>
+
+ Merge r187375
+
+ 2015-07-24 Anders Carlsson <andersca@apple.com>
+
+ WKWebsiteDataStore remove methods don't properly delete cookies
+ https://bugs.webkit.org/show_bug.cgi?id=147282
+ rdar://problem/21948230
+
+ Reviewed by Sam Weinig.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
+ Call deleteCookiesForHostnames instead of iterating over each hostname.
+
+ * WebProcess/Cookies/WebCookieManager.cpp:
+ (WebKit::WebCookieManager::deleteCookiesForHostname):
+ Call deleteCookiesForHostnames.
+
</ins><span class="cx"> 2015-07-30 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r187565. rdar://problem/22061043
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (187642 => 187643)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-07-31 14:28:37 UTC (rev 187642)
+++ branches/safari-601.1-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-07-31 15:58:51 UTC (rev 187643)
</span><span class="lines">@@ -417,10 +417,8 @@
</span><span class="cx"> void NetworkProcess::deleteWebsiteDataForOrigins(SessionID sessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> if (websiteDataTypes & WebsiteDataTypeCookies) {
</span><del>- if (auto* networkStorageSession = SessionTracker::session(sessionID)) {
- for (const auto& cookieHostName : cookieHostNames)
- deleteCookiesForHostname(*networkStorageSession, cookieHostName);
- }
</del><ins>+ if (auto* networkStorageSession = SessionTracker::session(sessionID))
+ deleteCookiesForHostnames(*networkStorageSession, cookieHostNames);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto completionHandler = [this, callbackID] {
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2WebProcessCookiesWebCookieManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp (187642 => 187643)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp 2015-07-31 14:28:37 UTC (rev 187642)
+++ branches/safari-601.1-branch/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp 2015-07-31 15:58:51 UTC (rev 187643)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> void WebCookieManager::deleteCookiesForHostname(const String& hostname)
</span><span class="cx"> {
</span><del>- WebCore::deleteCookiesForHostname(NetworkStorageSession::defaultStorageSession(), hostname);
</del><ins>+ WebCore::deleteCookiesForHostnames(NetworkStorageSession::defaultStorageSession(), { hostname });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebCookieManager::deleteAllCookies()
</span></span></pre>
</div>
</div>
</body>
</html>