Diff
Modified: trunk/Source/WebCore/ChangeLog (91615 => 91616)
--- trunk/Source/WebCore/ChangeLog 2011-07-22 23:05:43 UTC (rev 91615)
+++ trunk/Source/WebCore/ChangeLog 2011-07-22 23:22:21 UTC (rev 91616)
@@ -1,3 +1,14 @@
+2011-07-22 Jessie Berlin <jber...@apple.com>
+
+ [WebKit2] Changing the cookie accept policy in Private Browsing doesn’t work
+ https://bugs.webkit.org/show_bug.cgi?id=64997
+
+ Reviewed by Ada Chan.
+
+ * WebCore.exp.in:
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+
2011-07-22 Sergey Glazunov <serg.glazu...@gmail.com>
Perform the _javascript_ navigation check on a complete URL
Modified: trunk/Source/WebCore/WebCore.exp.in (91615 => 91616)
--- trunk/Source/WebCore/WebCore.exp.in 2011-07-22 23:05:43 UTC (rev 91615)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-07-22 23:22:21 UTC (rev 91616)
@@ -1411,6 +1411,7 @@
_wkSetCONNECTProxyForStream
_wkSetCookieStoragePrivateBrowsingEnabled
_wkSetDragImage
+_wkSetHTTPCookieAcceptPolicy
_wkSetHTTPCookiesForURL
_wkSetHTTPPipeliningMaximumPriority
_wkSetHTTPPipeliningMinimumFastLanePriority
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (91615 => 91616)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-07-22 23:05:43 UTC (rev 91615)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-07-22 23:22:21 UTC (rev 91616)
@@ -329,6 +329,7 @@
typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
extern CFHTTPCookieStorageRef (*wkCopyHTTPCookieStorage)(CFURLStorageSessionRef);
extern unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
+extern void (*wkSetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef, unsigned);
extern NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *);
extern void (*wkSetHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
extern void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (91615 => 91616)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2011-07-22 23:05:43 UTC (rev 91615)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2011-07-22 23:22:21 UTC (rev 91616)
@@ -196,6 +196,7 @@
NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*);
CFHTTPCookieStorageRef (*wkCopyHTTPCookieStorage)(CFURLStorageSessionRef);
unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
+void (*wkSetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef, unsigned);
NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *);
void (*wkSetHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);
Modified: trunk/Source/WebKit2/ChangeLog (91615 => 91616)
--- trunk/Source/WebKit2/ChangeLog 2011-07-22 23:05:43 UTC (rev 91615)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-22 23:22:21 UTC (rev 91616)
@@ -1,3 +1,16 @@
+2011-07-22 Jessie Berlin <jber...@apple.com>
+
+ [WebKit2] Changing the cookie accept policy in Private Browsing doesn’t work.
+ https://bugs.webkit.org/show_bug.cgi?id=64997
+
+ Reviewed by Ada Chan.
+
+ * WebProcess/Cookies/mac/WebCookieManagerMac.mm:
+ (WebKit::WebCookieManager::platformSetHTTPCookieAcceptPolicy):
+ Set the policy on the Cookie Storage used by the Private Browsing Storage Session as well.
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
2011-07-21 Yael Aharon <yael.aha...@nokia.com>
[Qt][WK2] Code cleanup for drag-and-drop
Modified: trunk/Source/WebKit2/WebProcess/Cookies/mac/WebCookieManagerMac.mm (91615 => 91616)
--- trunk/Source/WebKit2/WebProcess/Cookies/mac/WebCookieManagerMac.mm 2011-07-22 23:05:43 UTC (rev 91615)
+++ trunk/Source/WebKit2/WebProcess/Cookies/mac/WebCookieManagerMac.mm 2011-07-22 23:22:21 UTC (rev 91616)
@@ -25,6 +25,8 @@
#import "config.h"
#import "WebCookieManager.h"
+#import <WebCore/ResourceHandle.h>
+#import <WebKitSystemInterface.h>
namespace WebKit {
@@ -33,7 +35,10 @@
[[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:policy];
#if USE(CFURLSTORAGESESSIONS)
- // FIXME: Also update the Private Browsing Storage Session's cookie storage.
+ if (CFURLStorageSessionRef privateBrowsingStorageSession = WebCore::ResourceHandle::privateBrowsingStorageSession()) {
+ RetainPtr<CFHTTPCookieStorageRef> cookieStorage(AdoptCF, WKCopyHTTPCookieStorage(privateBrowsingStorageSession));
+ WKSetHTTPCookieAcceptPolicy(cookieStorage.get(), policy);
+ }
#endif
}
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (91615 => 91616)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2011-07-22 23:05:43 UTC (rev 91615)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2011-07-22 23:22:21 UTC (rev 91616)
@@ -103,6 +103,7 @@
INIT(CopyRequestWithStorageSession);
INIT(CopyHTTPCookieStorage);
INIT(GetHTTPCookieAcceptPolicy);
+ INIT(SetHTTPCookieAcceptPolicy);
INIT(HTTPCookiesForURL);
INIT(SetHTTPCookiesForURL);
INIT(DeleteHTTPCookie);
Modified: trunk/WebKitLibraries/ChangeLog (91615 => 91616)
--- trunk/WebKitLibraries/ChangeLog 2011-07-22 23:05:43 UTC (rev 91615)
+++ trunk/WebKitLibraries/ChangeLog 2011-07-22 23:22:21 UTC (rev 91616)
@@ -1,3 +1,18 @@
+2011-07-22 Jessie Berlin <jber...@apple.com>
+
+ [WebKit2] Changing the cookie accept policy in Private Browsing doesn’t work.
+ https://bugs.webkit.org/show_bug.cgi?id=64997
+
+ Reviewed by Ada Chan.
+
+ Add a wrapper around the setter for the CF HTTP cookie accept policy (since it is not
+ declared in the public headers on Snow Leopard). This wrapper is not necessary for Windows.
+
+ * WebKitSystemInterface.h:
+ * libWebKitSystemInterfaceLeopard.a:
+ * libWebKitSystemInterfaceLion.a:
+ * libWebKitSystemInterfaceSnowLeopard.a:
+
2011-07-15 Pratik Solanki <psola...@apple.com>
Part of https://bugs.webkit.org/show_bug.cgi?id=63674
Modified: trunk/WebKitLibraries/WebKitSystemInterface.h (91615 => 91616)
--- trunk/WebKitLibraries/WebKitSystemInterface.h 2011-07-22 23:05:43 UTC (rev 91615)
+++ trunk/WebKitLibraries/WebKitSystemInterface.h 2011-07-22 23:22:21 UTC (rev 91616)
@@ -229,6 +229,7 @@
typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
CFHTTPCookieStorageRef WKCopyHTTPCookieStorage(CFURLStorageSessionRef);
unsigned WKGetHTTPCookieAcceptPolicy(CFHTTPCookieStorageRef);
+void WKSetHTTPCookieAcceptPolicy(CFHTTPCookieStorageRef, unsigned policy);
NSArray *WKHTTPCookiesForURL(CFHTTPCookieStorageRef, NSURL *);
void WKSetHTTPCookiesForURL(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
void WKDeleteHTTPCookie(CFHTTPCookieStorageRef, NSHTTPCookie *);
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
(Binary files differ)
