Title: [230947] trunk/Source/WebCore
- Revision
- 230947
- Author
- [email protected]
- Date
- 2018-04-24 00:51:30 -0700 (Tue, 24 Apr 2018)
Log Message
Another attempt to fix the Mac and iOS build following r230944
(https://bugs.webkit.org/show_bug.cgi?id=159464)
* platform/network/mac/CookieJarMac.mm:
(WebCore::policyProperties):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (230946 => 230947)
--- trunk/Source/WebCore/ChangeLog 2018-04-24 07:47:14 UTC (rev 230946)
+++ trunk/Source/WebCore/ChangeLog 2018-04-24 07:51:30 UTC (rev 230947)
@@ -1,5 +1,13 @@
2018-04-24 Daniel Bates <[email protected]>
+ Another attempt to fix the Mac and iOS build following r230944
+ (https://bugs.webkit.org/show_bug.cgi?id=159464)
+
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::policyProperties):
+
+2018-04-24 Daniel Bates <[email protected]>
+
Attempt to fix the Mac and iOS build following r230944
(https://bugs.webkit.org/show_bug.cgi?id=159464)
Modified: trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm (230946 => 230947)
--- trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2018-04-24 07:47:14 UTC (rev 230946)
+++ trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2018-04-24 07:51:30 UTC (rev 230947)
@@ -73,9 +73,9 @@
CFHTTPCookieStorageDeleteCookie(cookieStorage, [cookie _GetInternalCFHTTPCookie]);
}
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
static RetainPtr<NSDictionary> policyProperties(const SameSiteInfo& sameSiteInfo, NSURL *url)
{
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
static NSURL *emptyURL = [[NSURL alloc] initWithString:@""];
NSDictionary *policyProperties = @{
@"_kCFHTTPCookiePolicyPropertySiteForCookies": sameSiteInfo.isSameSite ? url : emptyURL,
@@ -82,12 +82,8 @@
@"_kCFHTTPCookiePolicyPropertyIsTopLevelNavigation": [NSNumber numberWithBool:sameSiteInfo.isTopSite],
};
return policyProperties;
-#else
- UNUSED_PARAM(sameSiteInfo);
- UNUSED_PARAM(url);
- return nullptr;
+}
#endif
-}
static NSArray *cookiesForURL(NSHTTPCookieStorage *storage, NSURL *url, NSURL *mainDocumentURL, const std::optional<SameSiteInfo>& sameSiteInfo, NSString *partition = nullptr)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
