Changeset 165632 in webkit

Timestamp:

Mar 14, 2014 11:38:31 AM (10 years ago)

Author:

mitz@apple.com

Message:

[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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKProcessPool.mm (modified) (3 diffs)
• UIProcess/API/Cocoa/WKProcessPoolPrivate.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-14  Dan Bernstein  <mitz@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-14  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm

@@ -36 +36 @@
 #import "WebCertificateInfo.h"
 #import "WebContext.h"
+#import "WebCookieManagerProxy.h"
 #import <WebCore/CertificateInfo.h>
 #import <wtf/RetainPtr.h>
@@ -41 +42 @@
 #if PLATFORM(IOS)
 #import <WebCore/WebCoreThreadSystemInterface.h>
+#endif
+
+#if __has_include(<CFNetwork/CFNSURLConnection.h>)
+#import <CFNetwork/CFNSURLConnection.h>
+#else
+enum : NSUInteger {
+    NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
+};
 #endif
 
@@ -112 +121 @@
 }
 
+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
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h

@@ -31 +31 @@
 
 - (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host;
+- (void)_setCookieAcceptPolicy:(NSHTTPCookieAcceptPolicy)policy;
 
 @end