Title: [238615] trunk/Source
- Revision
- 238615
- Author
- [email protected]
- Date
- 2018-11-28 09:28:13 -0800 (Wed, 28 Nov 2018)
Log Message
Remove another OS version check from NetworkDataTaskCocoa.mm
https://bugs.webkit.org/show_bug.cgi?id=192046
Reviewed by Alex Christensen.
Source/WebKit:
* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTaskCocoa::statelessCookieStorage):
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (238614 => 238615)
--- trunk/Source/WTF/ChangeLog 2018-11-28 17:19:39 UTC (rev 238614)
+++ trunk/Source/WTF/ChangeLog 2018-11-28 17:28:13 UTC (rev 238615)
@@ -1,5 +1,14 @@
2018-11-28 Alexey Proskuryakov <[email protected]>
+ Remove another OS version check from NetworkDataTaskCocoa.mm
+ https://bugs.webkit.org/show_bug.cgi?id=192046
+
+ Reviewed by Alex Christensen.
+
+ * wtf/Platform.h:
+
+2018-11-28 Alexey Proskuryakov <[email protected]>
+
Modernize version checks for same site cookie support
https://bugs.webkit.org/show_bug.cgi?id=192054
Modified: trunk/Source/WTF/wtf/Platform.h (238614 => 238615)
--- trunk/Source/WTF/wtf/Platform.h 2018-11-28 17:19:39 UTC (rev 238614)
+++ trunk/Source/WTF/wtf/Platform.h 2018-11-28 17:28:13 UTC (rev 238615)
@@ -1385,3 +1385,7 @@
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS)
#define HAVE_FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT 1
#endif
+
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101400
+#define HAVE_NSHTTPCOOKIESTORAGE__INITWITHIDENTIFIER_WITH_INACCURATE_NULLABILITY 1
+#endif
Modified: trunk/Source/WebKit/ChangeLog (238614 => 238615)
--- trunk/Source/WebKit/ChangeLog 2018-11-28 17:19:39 UTC (rev 238614)
+++ trunk/Source/WebKit/ChangeLog 2018-11-28 17:28:13 UTC (rev 238615)
@@ -1,5 +1,15 @@
2018-11-28 Alexey Proskuryakov <[email protected]>
+ Remove another OS version check from NetworkDataTaskCocoa.mm
+ https://bugs.webkit.org/show_bug.cgi?id=192046
+
+ Reviewed by Alex Christensen.
+
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ (WebKit::NetworkDataTaskCocoa::statelessCookieStorage):
+
+2018-11-28 Alexey Proskuryakov <[email protected]>
+
Modernize version checks for same site cookie support
https://bugs.webkit.org/show_bug.cgi?id=192054
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (238614 => 238615)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2018-11-28 17:19:39 UTC (rev 238614)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2018-11-28 17:28:13 UTC (rev 238615)
@@ -117,11 +117,11 @@
{
static NeverDestroyed<RetainPtr<NSHTTPCookieStorage>> statelessCookieStorage;
if (!statelessCookieStorage.get()) {
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
+#if HAVE(NSHTTPCOOKIESTORAGE__INITWITHIDENTIFIER_WITH_INACCURATE_NULLABILITY)
IGNORE_NULL_CHECK_WARNINGS_BEGIN
#endif
statelessCookieStorage.get() = adoptNS([[NSHTTPCookieStorage alloc] _initWithIdentifier:nil private:YES]);
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
+#if HAVE(NSHTTPCOOKIESTORAGE__INITWITHIDENTIFIER_WITH_INACCURATE_NULLABILITY)
IGNORE_NULL_CHECK_WARNINGS_END
#endif
statelessCookieStorage.get().get().cookieAcceptPolicy = NSHTTPCookieAcceptPolicyNever;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes