Changeset 238615 in webkit

Timestamp:

Nov 28, 2018, 9:28:13 AM (6 years ago)

Author:

ap@apple.com

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:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-11-28  Alexey Proskuryakov  <ap@apple.com>
+
+        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  <ap@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1386 +1386 @@
 #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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-28  Alexey Proskuryakov  <ap@apple.com>
+
+        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  <ap@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm

@@ -118 +118 @@
     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