Title: [189319] branches/safari-601-branch/Source/WebCore
- Revision
- 189319
- Author
- [email protected]
- Date
- 2015-09-03 16:43:42 -0700 (Thu, 03 Sep 2015)
Log Message
Merged r189101. rdar://problem/22483710
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (189318 => 189319)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-09-03 23:42:32 UTC (rev 189318)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-09-03 23:43:42 UTC (rev 189319)
@@ -1,5 +1,20 @@
2015-09-03 Babak Shafiei <[email protected]>
+ Merge r189101.
+
+ 2015-08-28 Brady Eidson <[email protected]>
+
+ Use new CFNetwork cookie jar SPI only on El Capitan.
+ https://bugs.webkit.org/show_bug.cgi?id=148574 and rdar://problem/22460752
+
+ Reviewed by David Kilzer.
+
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::setCookiesFromDOM): Use OS X version to decide which API/SPI to use.
+ * platform/spi/cf/CFNetworkSPI.h: Forward declare the SPI
+
+2015-09-03 Babak Shafiei <[email protected]>
+
Merge r188659.
2015-08-19 Brent Fulgham <[email protected]>
Modified: branches/safari-601-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm (189318 => 189319)
--- branches/safari-601-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm 2015-09-03 23:42:32 UTC (rev 189318)
+++ branches/safari-601-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm 2015-09-03 23:43:42 UTC (rev 189319)
@@ -120,14 +120,11 @@
NSURL *cookieURL = url;
NSDictionary *headerFields = [NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"];
- NSArray *unfilteredCookies;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundeclared-selector"
- if ([[NSHTTPCookie class] respondsToSelector:@selector(_parsedCookiesWithResponseHeaderFields:forURL:)])
- unfilteredCookies = [NSHTTPCookie performSelector:@selector(_parsedCookiesWithResponseHeaderFields:forURL:) withObject:headerFields withObject:cookieURL];
-#pragma clang diagnostic pop
- else
- unfilteredCookies = [NSHTTPCookie cookiesWithResponseHeaderFields:headerFields forURL:cookieURL];
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+ NSArray *unfilteredCookies = [NSHTTPCookie _parsedCookiesWithResponseHeaderFields:headerFields forURL:cookieURL];
+#else
+ NSArray *unfilteredCookies = [NSHTTPCookie cookiesWithResponseHeaderFields:headerFields forURL:cookieURL];
+#endif
RetainPtr<NSArray> filteredCookies = filterCookies(unfilteredCookies);
ASSERT([filteredCookies.get() count] <= 1);
Modified: branches/safari-601-branch/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (189318 => 189319)
--- branches/safari-601-branch/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-09-03 23:42:32 UTC (rev 189318)
+++ branches/safari-601-branch/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-09-03 23:43:42 UTC (rev 189319)
@@ -129,6 +129,12 @@
#if defined(__OBJC__)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+@interface NSHTTPCookie ()
++ (NSArray *)_parsedCookiesWithResponseHeaderFields:(NSDictionary *)headerFields forURL:(NSURL *)aURL;
+@end
+#endif
+
#if !USE(APPLE_INTERNAL_SDK) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1090)
@interface NSHTTPCookieStorage (Details)
- (void)removeCookiesSinceDate:(NSDate *)date;
@@ -144,6 +150,6 @@
+ (void)_setSharedHTTPCookieStorage:(NSHTTPCookieStorage *)storage;
@end
#endif
-#endif
+#endif // defined(__OBJC__)
#endif // CFNetworkSPI_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
