Title: [165901] tags/Safari-538.23.1/Source/WebKit2
- Revision
- 165901
- Author
- bshaf...@apple.com
- Date
- 2014-03-19 10:51:23 -0700 (Wed, 19 Mar 2014)
Log Message
Merged r165632.
Modified Paths
Diff
Modified: tags/Safari-538.23.1/Source/WebKit2/ChangeLog (165900 => 165901)
--- tags/Safari-538.23.1/Source/WebKit2/ChangeLog 2014-03-19 17:36:37 UTC (rev 165900)
+++ tags/Safari-538.23.1/Source/WebKit2/ChangeLog 2014-03-19 17:51:23 UTC (rev 165901)
@@ -1,3 +1,21 @@
+2014-03-19 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r165632
+
+ 2014-03-14 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] Expose a way to set the cookie accept policy
+ https://bugs.webkit.org/show_bug.cgi?id=130251
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (toHTTPCookieAcceptPolicy): Added a helper function that maps from NSHTTPCookieAcceptPolicy
+ values to WebKit::HTTPCookieAcceptPolicy values.
+ (-[WKProcessPool _setCookieAcceptPolicy:]): Added. Calls
+ WebCookieManagerProxy::setHTTPCookieAcceptPolicy.
+ * UIProcess/API/Cocoa/WKProcessPoolPrivate.h: Declared new method.
+
2014-03-17 Filip Pizlo <fpi...@apple.com>
More FTL enabling.
Modified: tags/Safari-538.23.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (165900 => 165901)
--- tags/Safari-538.23.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-03-19 17:36:37 UTC (rev 165900)
+++ tags/Safari-538.23.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-03-19 17:51:23 UTC (rev 165901)
@@ -35,6 +35,7 @@
#import "WKProcessPoolConfigurationPrivate.h"
#import "WebCertificateInfo.h"
#import "WebContext.h"
+#import "WebCookieManagerProxy.h"
#import <WebCore/CertificateInfo.h>
#import <wtf/RetainPtr.h>
@@ -42,6 +43,14 @@
#import <WebCore/WebCoreThreadSystemInterface.h>
#endif
+#if __has_include(<CFNetwork/CFNSURLConnection.h>)
+#import <CFNetwork/CFNSURLConnection.h>
+#else
+enum : NSUInteger {
+ NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
+};
+#endif
+
@implementation WKProcessPool
- (instancetype)init
@@ -111,6 +120,28 @@
_context->allowSpecificHTTPSCertificateForHost(WebKit::WebCertificateInfo::create(WebCore::CertificateInfo((CFArrayRef)certificateChain)).get(), host);
}
+static WebKit::HTTPCookieAcceptPolicy toHTTPCookieAcceptPolicy(NSHTTPCookieAcceptPolicy policy)
+{
+ switch (static_cast<NSUInteger>(policy)) {
+ case NSHTTPCookieAcceptPolicyAlways:
+ return WebKit::HTTPCookieAcceptPolicyAlways;
+ case NSHTTPCookieAcceptPolicyNever:
+ return WebKit::HTTPCookieAcceptPolicyNever;
+ case NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
+ return WebKit::HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
+ case NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
+ return WebKit::HTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
+ }
+
+ ASSERT_NOT_REACHED();
+ return WebKit::HTTPCookieAcceptPolicyAlways;
+}
+
+- (void)_setCookieAcceptPolicy:(NSHTTPCookieAcceptPolicy)policy
+{
+ _context->supplement<WebKit::WebCookieManagerProxy>()->setHTTPCookieAcceptPolicy(toHTTPCookieAcceptPolicy(policy));
+}
+
@end
#endif // WK_API_ENABLED
Modified: tags/Safari-538.23.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (165900 => 165901)
--- tags/Safari-538.23.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2014-03-19 17:36:37 UTC (rev 165900)
+++ tags/Safari-538.23.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2014-03-19 17:51:23 UTC (rev 165901)
@@ -30,6 +30,7 @@
@interface WKProcessPool (WKPrivate)
- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host;
+- (void)_setCookieAcceptPolicy:(NSHTTPCookieAcceptPolicy)policy;
@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
