Title: [237954] branches/safari-606-branch/Source
- Revision
- 237954
- Author
- kocsen_ch...@apple.com
- Date
- 2018-11-07 16:46:00 -0800 (Wed, 07 Nov 2018)
Log Message
Revert "Apply patch. rdar://problem/45523764"
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebCore/PAL/ChangeLog (237953 => 237954)
--- branches/safari-606-branch/Source/WebCore/PAL/ChangeLog 2018-11-08 00:39:38 UTC (rev 237953)
+++ branches/safari-606-branch/Source/WebCore/PAL/ChangeLog 2018-11-08 00:46:00 UTC (rev 237954)
@@ -52,21 +52,6 @@
* pal/spi/mac/NSScrollerImpSPI.h: Added effectiveAppearanceForScrollerImp:.
-2018-10-28 Babak Shafiei <bshaf...@apple.com>
-
- Apply patch. rdar://problem/45523764
-
- 2018-10-28 John Wilander <wilan...@apple.com>
-
- Override the session configuration for cookieAcceptPolicy
- https://bugs.webkit.org/show_bug.cgi?id=190925
- <rdar://problem/45497382>
-
- Reviewed by Alex Christensen.
-
- * pal/spi/cf/CFNetworkSPI.h:
- Added the _overrideSessionCookieAcceptPolicy property.
-
2018-09-06 Babak Shafiei <bshaf...@apple.com>
Cherry-pick r235349. rdar://problem/44209834
Modified: branches/safari-606-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (237953 => 237954)
--- branches/safari-606-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-11-08 00:39:38 UTC (rev 237953)
+++ branches/safari-606-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-11-08 00:46:00 UTC (rev 237954)
@@ -165,7 +165,6 @@
- (void)_getCookiesForURL:(NSURL *)url mainDocumentURL:(NSURL *)mainDocumentURL partition:(NSString *)partition completionHandler:(void (^)(NSArray *))completionHandler;
- (void)_getCookiesForURL:(NSURL *)url mainDocumentURL:(NSURL *)mainDocumentURL partition:(NSString *)partition policyProperties:(NSDictionary*)props completionHandler:(void (^)(NSArray *))completionHandler;
- (void)_setCookies:(NSArray *)cookies forURL:(NSURL *)URL mainDocumentURL:(NSURL *)mainDocumentURL policyProperties:(NSDictionary*) props;
-@property (nonatomic, readwrite) BOOL _overrideSessionCookieAcceptPolicy;
@end
@interface NSURLSessionTask ()
Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (237953 => 237954)
--- branches/safari-606-branch/Source/WebKit/ChangeLog 2018-11-08 00:39:38 UTC (rev 237953)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog 2018-11-08 00:46:00 UTC (rev 237954)
@@ -95,23 +95,6 @@
2018-10-28 Babak Shafiei <bshaf...@apple.com>
- Apply patch. rdar://problem/45523764
-
- 2018-10-28 John Wilander <wilan...@apple.com>
-
- Override the session configuration for cookieAcceptPolicy
- https://bugs.webkit.org/show_bug.cgi?id=190925
- <rdar://problem/45497382>
-
- Reviewed by Alex Christensen.
-
- * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
- (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
- Sets the _overrideSessionCookieAcceptPolicy property to YES
- If the application is Safari.
-
-2018-10-28 Babak Shafiei <bshaf...@apple.com>
-
Cherry-pick r237135. rdar://problem/45562440
[iOS] Can't select text after dismissing the keyboard when changing focus
Modified: branches/safari-606-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (237953 => 237954)
--- branches/safari-606-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-11-08 00:39:38 UTC (rev 237953)
+++ branches/safari-606-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-11-08 00:46:00 UTC (rev 237954)
@@ -44,7 +44,6 @@
#import <WebCore/ResourceError.h>
#import <WebCore/ResourceRequest.h>
#import <WebCore/ResourceResponse.h>
-#import <WebCore/RuntimeApplicationChecks.h>
#import <WebCore/SharedBuffer.h>
#import <WebCore/URL.h>
#import <WebCore/WebCoreURLResponse.h>
@@ -714,23 +713,9 @@
auto* storageSession = WebCore::NetworkStorageSession::storageSession(parameters.sessionID);
RELEASE_ASSERT(storageSession);
-
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || PLATFORM(IOS)
if (CFHTTPCookieStorageRef storage = storageSession->cookieStorage().get())
configuration.HTTPCookieStorage = [[[NSHTTPCookieStorage alloc] _initWithCFHTTPCookieStorage:storage] autorelease];
-#else
- NSHTTPCookieStorage* cookieStorage;
- if (CFHTTPCookieStorageRef storage = storageSession->cookieStorage().get()) {
- cookieStorage = [[[NSHTTPCookieStorage alloc] _initWithCFHTTPCookieStorage:storage] autorelease];
- configuration.HTTPCookieStorage = cookieStorage;
- } else
- cookieStorage = storageSession->nsCookieStorage();
- ASSERT(cookieStorage);
- if (WebCore::MacApplication::isSafari() && [cookieStorage respondsToSelector:@selector(_overrideSessionCookieAcceptPolicy)])
- cookieStorage._overrideSessionCookieAcceptPolicy = YES;
-#endif
-
m_sessionWithCredentialStorageDelegate = adoptNS([[WKNetworkSessionDelegate alloc] initWithNetworkSession:*this withCredentials:true]);
m_sessionWithCredentialStorage = [NSURLSession sessionWithConfiguration:configuration delegate:static_cast<id>(m_sessionWithCredentialStorageDelegate.get()) delegateQueue:[NSOperationQueue mainQueue]];
LOG(NetworkSession, "Created NetworkSession with cookieAcceptPolicy %lu", configuration.HTTPCookieStorage.cookieAcceptPolicy);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
