Title: [238614] trunk/Source
Revision
238614
Author
[email protected]
Date
2018-11-28 09:19:39 -0800 (Wed, 28 Nov 2018)

Log Message

Modernize version checks for same site cookie support
https://bugs.webkit.org/show_bug.cgi?id=192054

Reviewed by Tim Horton.

Source/WebCore/PAL:

* pal/spi/cf/CFNetworkSPI.h:

Source/WebKit:

* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm: (WebKit::updateTaskWithFirstPartyForSameSiteCookies):
Also removed runtime checks, which are no longer relevant.

Source/WTF:

* wtf/Platform.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (238613 => 238614)


--- trunk/Source/WTF/ChangeLog	2018-11-28 17:17:28 UTC (rev 238613)
+++ trunk/Source/WTF/ChangeLog	2018-11-28 17:19:39 UTC (rev 238614)
@@ -1,3 +1,12 @@
+2018-11-28  Alexey Proskuryakov  <[email protected]>
+
+        Modernize version checks for same site cookie support
+        https://bugs.webkit.org/show_bug.cgi?id=192054
+
+        Reviewed by Tim Horton.
+
+        * wtf/Platform.h:
+
 2018-11-27  Alexey Proskuryakov  <[email protected]>
 
         Modernize the check for async _saveCookies existence

Modified: trunk/Source/WTF/wtf/Platform.h (238613 => 238614)


--- trunk/Source/WTF/wtf/Platform.h	2018-11-28 17:17:28 UTC (rev 238613)
+++ trunk/Source/WTF/wtf/Platform.h	2018-11-28 17:19:39 UTC (rev 238614)
@@ -1380,3 +1380,8 @@
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS)
 #define HAVE_FOUNDATION_WITH_SAVE_COOKIES_WITH_COMPLETION_HANDLER 1
 #endif
+
+/* FIXME: Should this be enabled for IOS_FAMILY, not just IOS? */
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS)
+#define HAVE_FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT 1
+#endif

Modified: trunk/Source/WebCore/PAL/ChangeLog (238613 => 238614)


--- trunk/Source/WebCore/PAL/ChangeLog	2018-11-28 17:17:28 UTC (rev 238613)
+++ trunk/Source/WebCore/PAL/ChangeLog	2018-11-28 17:19:39 UTC (rev 238614)
@@ -1,3 +1,12 @@
+2018-11-28  Alexey Proskuryakov  <[email protected]>
+
+        Modernize version checks for same site cookie support
+        https://bugs.webkit.org/show_bug.cgi?id=192054
+
+        Reviewed by Tim Horton.
+
+        * pal/spi/cf/CFNetworkSPI.h:
+
 2018-11-27  Mark Lam  <[email protected]>
 
         ENABLE_FAST_JIT_PERMISSIONS should be false for iosmac.

Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (238613 => 238614)


--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2018-11-28 17:17:28 UTC (rev 238613)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2018-11-28 17:19:39 UTC (rev 238614)
@@ -206,8 +206,10 @@
 - (NSDictionary *)_timingData;
 @property (readwrite, copy) NSString *_pathToDownloadTaskFile;
 @property (copy) NSString *_storagePartitionIdentifier;
+#if HAVE(FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT)
 @property (nullable, readwrite, retain) NSURL *_siteForCookies;
 @property (readwrite) BOOL _isTopLevelNavigation;
+#endif
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
 @property (nonatomic, assign) BOOL _preconnect;
 #endif

Modified: trunk/Source/WebKit/ChangeLog (238613 => 238614)


--- trunk/Source/WebKit/ChangeLog	2018-11-28 17:17:28 UTC (rev 238613)
+++ trunk/Source/WebKit/ChangeLog	2018-11-28 17:19:39 UTC (rev 238614)
@@ -1,3 +1,13 @@
+2018-11-28  Alexey Proskuryakov  <[email protected]>
+
+        Modernize version checks for same site cookie support
+        https://bugs.webkit.org/show_bug.cgi?id=192054
+
+        Reviewed by Tim Horton.
+
+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm: (WebKit::updateTaskWithFirstPartyForSameSiteCookies):
+        Also removed runtime checks, which are no longer relevant.
+
 2018-11-27  Mark Lam  <[email protected]>
 
         ENABLE_FAST_JIT_PERMISSIONS should be false for iosmac.

Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (238613 => 238614)


--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	2018-11-28 17:17:28 UTC (rev 238613)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	2018-11-28 17:19:39 UTC (rev 238614)
@@ -152,12 +152,10 @@
 {
     if (request.isSameSiteUnspecified())
         return;
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
+#if HAVE(FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT)
     static NSURL *emptyURL = [[NSURL alloc] initWithString:@""];
-    if ([task respondsToSelector:@selector(set_siteForCookies:)])
-        task._siteForCookies = request.isSameSite() ? task.currentRequest.URL : emptyURL;
-    if ([task respondsToSelector:@selector(set_isTopLevelNavigation:)])
-        task._isTopLevelNavigation = request.isTopSite();
+    task._siteForCookies = request.isSameSite() ? task.currentRequest.URL : emptyURL;
+    task._isTopLevelNavigation = request.isTopSite();
 #else
     UNUSED_PARAM(task);
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to