Title: [238567] trunk/Source
- Revision
- 238567
- Author
- [email protected]
- Date
- 2018-11-27 12:40:40 -0800 (Tue, 27 Nov 2018)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (238566 => 238567)
--- trunk/Source/WTF/ChangeLog 2018-11-27 20:20:18 UTC (rev 238566)
+++ trunk/Source/WTF/ChangeLog 2018-11-27 20:40:40 UTC (rev 238567)
@@ -1,3 +1,13 @@
+2018-11-27 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
[Win][Clang] SOFT_LINK reports warning: implicit conversion between pointer-to-function and pointer-to-object is a Microsoft extension [-Wmicrosoft-cast]
Modified: trunk/Source/WTF/wtf/Platform.h (238566 => 238567)
--- trunk/Source/WTF/wtf/Platform.h 2018-11-27 20:20:18 UTC (rev 238566)
+++ trunk/Source/WTF/wtf/Platform.h 2018-11-27 20:40:40 UTC (rev 238567)
@@ -1375,3 +1375,8 @@
#if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_FAMILY_SIMULATOR)
#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
Modified: trunk/Source/WebCore/PAL/ChangeLog (238566 => 238567)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-11-27 20:20:18 UTC (rev 238566)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-11-27 20:40:40 UTC (rev 238567)
@@ -1,3 +1,13 @@
+2018-11-27 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
Adopt -setOverrideRouteSharingPolicy:routingContextUID: SPI
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (238566 => 238567)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-11-27 20:20:18 UTC (rev 238566)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-11-27 20:40:40 UTC (rev 238567)
@@ -137,7 +137,9 @@
- (id)_initWithCFHTTPCookieStorage:(CFHTTPCookieStorageRef)cfStorage;
- (CFHTTPCookieStorageRef)_cookieStorage;
- (void)_saveCookies;
+#if HAVE(FOUNDATION_WITH_SAVE_COOKIES_WITH_COMPLETION_HANDLER)
- (void)_saveCookies:(dispatch_block_t) completionHandler;
+#endif
@end
@interface NSURLConnection ()
@@ -372,10 +374,8 @@
@end
@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
@interface NSURLSessionTask ()
Modified: trunk/Source/WebKit/ChangeLog (238566 => 238567)
--- trunk/Source/WebKit/ChangeLog 2018-11-27 20:20:18 UTC (rev 238566)
+++ trunk/Source/WebKit/ChangeLog 2018-11-27 20:40:40 UTC (rev 238567)
@@ -1,3 +1,13 @@
+2018-11-27 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
Serialize and deserialize editable image strokes
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (238566 => 238567)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2018-11-27 20:20:18 UTC (rev 238566)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2018-11-27 20:40:40 UTC (rev 238567)
@@ -211,7 +211,7 @@
});
}
-#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)
{
ASSERT(RunLoop::isMain());
@@ -227,8 +227,8 @@
void NetworkProcess::platformSyncAllCookies(CompletionHandler<void()>&& completionHander) {
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) {
saveCookies(networkStorageSession.nsCookieStorage(), [callbackAggregator] { });
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
