<!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>[202279] 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/202279">202279</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-21 10:20:08 -0700 (Tue, 21 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Upstream WKHTTPCookiesForURL from WebKitSystemInterface to OpenSource
https://bugs.webkit.org/show_bug.cgi?id=158967
Patch by Amir Alavi <aalavi@apple.com> on 2016-06-21
Reviewed by Brent Fulgham.
Source/WebCore:
* platform/ios/WebCoreSystemInterfaceIOS.mm:
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:
* platform/network/mac/CookieJarMac.mm:
(WebCore::httpCookiesForURL): Upstreamed from WebKitSystemInterface.
(WebCore::cookiesForURL): Changed to call httpCookiesForURL.
(WebCore::deleteCookie): Ditto.
* platform/spi/cf/CFNetworkSPI.h:
Source/WebKit/mac:
* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Deleted.
Source/WebKit2:
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm">trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacCookieJarMacmm">trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicfCFNetworkSPIh">trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm">trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202278 => 202279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-21 17:05:48 UTC (rev 202278)
+++ trunk/Source/WebCore/ChangeLog 2016-06-21 17:20:08 UTC (rev 202279)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-21 Amir Alavi <aalavi@apple.com>
+
+ Upstream WKHTTPCookiesForURL from WebKitSystemInterface to OpenSource
+ https://bugs.webkit.org/show_bug.cgi?id=158967
+
+ Reviewed by Brent Fulgham.
+
+ * platform/ios/WebCoreSystemInterfaceIOS.mm:
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::httpCookiesForURL): Upstreamed from WebKitSystemInterface.
+ (WebCore::cookiesForURL): Changed to call httpCookiesForURL.
+ (WebCore::deleteCookie): Ditto.
+ * platform/spi/cf/CFNetworkSPI.h:
+
</ins><span class="cx"> 2016-06-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r202231.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (202278 => 202279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2016-06-21 17:05:48 UTC (rev 202278)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2016-06-21 17:20:08 UTC (rev 202279)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> WEBCORE_EXPORT NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*);
</span><span class="cx"> WEBCORE_EXPORT unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
</span><span class="cx"> WEBCORE_EXPORT NSArray *(*wkHTTPCookies)(CFHTTPCookieStorageRef);
</span><del>-WEBCORE_EXPORT NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *, NSURL *);
</del><span class="cx"> WEBCORE_EXPORT void (*wkSetHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
</span><span class="cx"> WEBCORE_EXPORT void (*wkDeleteAllHTTPCookies)(CFHTTPCookieStorageRef);
</span><span class="cx"> WEBCORE_EXPORT void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (202278 => 202279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2016-06-21 17:05:48 UTC (rev 202278)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2016-06-21 17:20:08 UTC (rev 202279)
</span><span class="lines">@@ -222,7 +222,6 @@
</span><span class="cx"> typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
</span><span class="cx"> extern unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
</span><span class="cx"> extern NSArray *(*wkHTTPCookies)(CFHTTPCookieStorageRef);
</span><del>-extern NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *, NSURL *);
</del><span class="cx"> extern void (*wkSetHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
</span><span class="cx"> extern void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);
</span><span class="cx"> extern void (*wkDeleteAllHTTPCookies)(CFHTTPCookieStorageRef);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (202278 => 202279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2016-06-21 17:05:48 UTC (rev 202278)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2016-06-21 17:20:08 UTC (rev 202279)
</span><span class="lines">@@ -99,7 +99,6 @@
</span><span class="cx"> NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*);
</span><span class="cx"> unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
</span><span class="cx"> NSArray *(*wkHTTPCookies)(CFHTTPCookieStorageRef);
</span><del>-NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *, NSURL *);
</del><span class="cx"> void (*wkSetHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
</span><span class="cx"> void (*wkDeleteAllHTTPCookies)(CFHTTPCookieStorageRef);
</span><span class="cx"> void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacCookieJarMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm (202278 => 202279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2016-06-21 17:05:48 UTC (rev 202278)
+++ trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2016-06-21 17:20:08 UTC (rev 202279)
</span><span class="lines">@@ -45,6 +45,22 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static NSArray *httpCookiesForURL(CFHTTPCookieStorageRef cookieStorage, NSURL *firstParty, NSURL *url)
+{
+ if (!cookieStorage) {
+ // FIXME: The fallback to NSHTTPCookieStorage should not be present when USE(CFNETWORK) is defined.
+ return [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:url];
+ }
+
+ bool secure = ![[url scheme] caseInsensitiveCompare:@"https"];
+
+ auto cookies = adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(cookieStorage, static_cast<CFURLRef>(url), static_cast<CFURLRef>(firstParty), secure));
+ NSArray *nsCookies = [NSHTTPCookie _cf2nsCookies:cookies.get()];
+
+ return nsCookies;
+}
+
+
</ins><span class="cx"> static RetainPtr<NSArray> filterCookies(NSArray *unfilteredCookies)
</span><span class="cx"> {
</span><span class="cx"> NSUInteger count = [unfilteredCookies count];
</span><span class="lines">@@ -118,7 +134,7 @@
</span><span class="cx"> if (NSArray *cookies = cookiesInPartitionForURL(session, firstParty, url))
</span><span class="cx"> return cookies;
</span><span class="cx"> #endif
</span><del>- return wkHTTPCookiesForURL(session.cookieStorage().get(), firstParty, url);
</del><ins>+ return httpCookiesForURL(session.cookieStorage().get(), firstParty, url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> enum IncludeHTTPOnlyOrNot { DoNotIncludeHTTPOnly, IncludeHTTPOnly };
</span><span class="lines">@@ -232,7 +248,7 @@
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFHTTPCookieStorageRef> cookieStorage = session.cookieStorage();
</span><del>- NSArray *cookies = wkHTTPCookiesForURL(cookieStorage.get(), 0, url);
</del><ins>+ NSArray *cookies = httpCookiesForURL(cookieStorage.get(), nil, url);
</ins><span class="cx">
</span><span class="cx"> NSString *cookieNameString = cookieName;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFNetworkSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (202278 => 202279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2016-06-21 17:05:48 UTC (rev 202278)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2016-06-21 17:20:08 UTC (rev 202279)
</span><span class="lines">@@ -178,6 +178,7 @@
</span><span class="cx"> EXTERN_C CFURLRef CFURLResponseGetURL(CFURLResponseRef);
</span><span class="cx"> EXTERN_C void CFURLResponseSetMIMEType(CFURLResponseRef, CFStringRef);
</span><span class="cx"> EXTERN_C CFHTTPCookieStorageRef _CFURLStorageSessionCopyCookieStorage(CFAllocatorRef, CFURLStorageSessionRef);
</span><ins>+EXTERN_C CFArrayRef _CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(CFHTTPCookieStorageRef inCookieStorage, CFURLRef inURL, CFURLRef inMainDocumentURL, Boolean sendSecureCookies);
</ins><span class="cx">
</span><span class="cx"> // FIXME: We should only forward declare this SPI when building for iOS without the Apple Internal SDK.
</span><span class="cx"> // As a workaround for <rdar://problem/19025016>, we must forward declare this SPI regardless of whether
</span><span class="lines">@@ -216,11 +217,12 @@
</span><span class="cx">
</span><span class="cx"> #if defined(__OBJC__)
</span><span class="cx">
</span><ins>+@interface NSHTTPCookie ()
</ins><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span><del>-@interface NSHTTPCookie ()
</del><span class="cx"> + (NSArray *)_parsedCookiesWithResponseHeaderFields:(NSDictionary *)headerFields forURL:(NSURL *)aURL;
</span><ins>+#endif
++ (NSArray *)_cf2nsCookies:(CFArrayRef)cfCookies;
</ins><span class="cx"> @end
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if !USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> @interface NSHTTPCookieStorage ()
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (202278 => 202279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-06-21 17:05:48 UTC (rev 202278)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-21 17:20:08 UTC (rev 202279)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-21 Amir Alavi <aalavi@apple.com>
+
+ Upstream WKHTTPCookiesForURL from WebKitSystemInterface to OpenSource
+ https://bugs.webkit.org/show_bug.cgi?id=158967
+
+ Reviewed by Brent Fulgham.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Deleted.
+
</ins><span class="cx"> 2016-06-20 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r202243.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (202278 => 202279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2016-06-21 17:05:48 UTC (rev 202278)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2016-06-21 17:20:08 UTC (rev 202279)
</span><span class="lines">@@ -113,7 +113,6 @@
</span><span class="cx"> INIT(CopyRequestWithStorageSession);
</span><span class="cx"> INIT(GetHTTPCookieAcceptPolicy);
</span><span class="cx"> INIT(HTTPCookies);
</span><del>- INIT(HTTPCookiesForURL);
</del><span class="cx"> INIT(SetHTTPCookiesForURL);
</span><span class="cx"> INIT(DeleteAllHTTPCookies);
</span><span class="cx"> INIT(DeleteHTTPCookie);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202278 => 202279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-21 17:05:48 UTC (rev 202278)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-21 17:20:08 UTC (rev 202279)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-21 Amir Alavi <aalavi@apple.com>
+
+ Upstream WKHTTPCookiesForURL from WebKitSystemInterface to OpenSource
+ https://bugs.webkit.org/show_bug.cgi?id=158967
+
+ Reviewed by Brent Fulgham.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Deleted.
+
</ins><span class="cx"> 2016-06-21 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Inlined some picture-in-picture code.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (202278 => 202279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2016-06-21 17:05:48 UTC (rev 202278)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2016-06-21 17:20:08 UTC (rev 202279)
</span><span class="lines">@@ -83,7 +83,6 @@
</span><span class="cx"> INIT(CopyRequestWithStorageSession);
</span><span class="cx"> INIT(GetHTTPCookieAcceptPolicy);
</span><span class="cx"> INIT(HTTPCookies);
</span><del>- INIT(HTTPCookiesForURL);
</del><span class="cx"> INIT(SetHTTPCookiesForURL);
</span><span class="cx"> INIT(DeleteAllHTTPCookies);
</span><span class="cx"> INIT(DeleteHTTPCookie);
</span></span></pre>
</div>
</div>
</body>
</html>