Changeset 238567 in webkit

Timestamp:

Nov 27, 2018, 12:40:40 PM (8 years ago)

Author:

ap@apple.com

Message:

Modernize the check for async _saveCookies existence
​https://bugs.webkit.org/show_bug.cgi?id=191987

Reviewed by Dean Jackson.

Source/WebCore/PAL:

• pal/spi/cf/CFNetworkSPI.h: Also removed a check around _socketStreamProperties,

which exists everywhere.

Source/WebKit:

• NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformSyncAllCookies):

Source/WTF:

• wtf/Platform.h: Added a specific macro for this. Not changing the behavior here,

although it seems very likely that we want to do the same on other iOS family OSes.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-11-27  Alexey Proskuryakov  <ap@apple.com>
+
+        Modernize the check for async _saveCookies existence
+        https://bugs.webkit.org/show_bug.cgi?id=191987
+
+        Reviewed by Dean Jackson.
+
+        * wtf/Platform.h: Added a specific macro for this. Not changing the behavior here,
+        although it seems very likely that we want to do the same on other iOS family OSes.
+
 2018-11-26  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1376 +1376 @@
 #define USE_IOSURFACE_CANVAS_BACKING_STORE 1
 #endif
+
+/* FIXME: Should this be enabled or IOS_FAMILY, not just IOS? */
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS)
+#define HAVE_FOUNDATION_WITH_SAVE_COOKIES_WITH_COMPLETION_HANDLER 1
+#endif

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2018-11-27  Alexey Proskuryakov  <ap@apple.com>
+
+        Modernize the check for async _saveCookies existence
+        https://bugs.webkit.org/show_bug.cgi?id=191987
+
+        Reviewed by Dean Jackson.
+
+        * pal/spi/cf/CFNetworkSPI.h: Also removed a check around _socketStreamProperties,
+        which exists everywhere.
+
 2018-11-27  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h

@@ -138 +138 @@
 - (CFHTTPCookieStorageRef)_cookieStorage;
 - (void)_saveCookies;
+#if HAVE(FOUNDATION_WITH_SAVE_COOKIES_WITH_COMPLETION_HANDLER)
 - (void)_saveCookies:(dispatch_block_t) completionHandler;
+#endif
 @end
 
@@ -373 +375 @@
 
 @interface NSURLSessionConfiguration ()
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
 // FIXME: Remove this once rdar://problem/40650244 is in a build.
 @property (copy) NSDictionary *_socketStreamProperties;
-#endif
 @end
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-27  Alexey Proskuryakov  <ap@apple.com>
+
+        Modernize the check for async _saveCookies existence
+        https://bugs.webkit.org/show_bug.cgi?id=191987
+
+        Reviewed by Dean Jackson.
+
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::platformSyncAllCookies):
+
 2018-11-27  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -212 +212 @@
 }
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
+#if HAVE(FOUNDATION_WITH_SAVE_COOKIES_WITH_COMPLETION_HANDLER)
 static void saveCookies(NSHTTPCookieStorage *cookieStorage, CompletionHandler<void()>&& completionHandler)
 {
@@ -228 +228 @@
     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
     ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-    
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
+
+#if HAVE(FOUNDATION_WITH_SAVE_COOKIES_WITH_COMPLETION_HANDLER)
     RefPtr<CallbackAggregator> callbackAggregator = CallbackAggregator::create(WTFMove(completionHander));
     WebCore::NetworkStorageSession::forEach([&] (auto& networkStorageSession) {