Title: [230934] trunk/Source/WebKit
- Revision
- 230934
- Author
- dba...@webkit.org
- Date
- 2018-04-23 17:26:31 -0700 (Mon, 23 Apr 2018)
Log Message
Attempt to fix the Apple Internal build following r230921
(https://bugs.webkit.org/show_bug.cgi?id=159464)
Forward declare some SPI. Add availability guard.
* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (230933 => 230934)
--- trunk/Source/WebKit/ChangeLog 2018-04-24 00:13:16 UTC (rev 230933)
+++ trunk/Source/WebKit/ChangeLog 2018-04-24 00:26:31 UTC (rev 230934)
@@ -1,3 +1,12 @@
+2018-04-23 Daniel Bates <daba...@apple.com>
+
+ Attempt to fix the Apple Internal build following r230921
+ (https://bugs.webkit.org/show_bug.cgi?id=159464)
+
+ Forward declare some SPI. Add availability guard.
+
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+
2018-04-23 Zalan Bujtas <za...@apple.com>
[LayoutFormattingContext] Initial commit.
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (230933 => 230934)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2018-04-24 00:13:16 UTC (rev 230933)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2018-04-24 00:26:31 UTC (rev 230934)
@@ -48,6 +48,11 @@
#import <WebKitAdditions/NetworkDataTaskCocoaAdditions.mm>
#endif
+@interface NSURLSessionTask (Staging)
+@property (nullable, readwrite, retain) NSURL *_siteForCookies;
+@property (readwrite) BOOL _isTopLevelNavigation;
+@end
+
namespace WebKit {
#if USE(CREDENTIAL_STORAGE_WITH_NETWORK_SESSION)
@@ -158,10 +163,12 @@
if (request.isSameSiteUnspecified())
return;
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();
+ if (@available(macOS 10.14, iOS 12, *)) {
+ if ([task respondsToSelector:@selector(set_siteForCookies:)])
+ task._siteForCookies = request.isSameSite() ? task.currentRequest.URL : emptyURL;
+ if ([task respondsToSelector:@selector(set_isTopLevelNavigation:)])
+ task._isTopLevelNavigation = request.isTopSite();
+ }
}
NetworkDataTaskCocoa::NetworkDataTaskCocoa(NetworkSession& session, NetworkDataTaskClient& client, const WebCore::ResourceRequest& requestWithCredentials, uint64_t frameID, uint64_t pageID, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, WebCore::ContentSniffingPolicy shouldContentSniff, WebCore::ContentEncodingSniffingPolicy shouldContentEncodingSniff, bool shouldClearReferrerOnHTTPSToHTTPRedirect, PreconnectOnly shouldPreconnectOnly)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
