WebKit2: Use CFNetwork Sessions API.

https://bugs.webkit.org/show_bug.cgi?id=55435.

Reviewed by Sam Weinig.

Source/WebCore:

When Private Browsing is enabled, use cookies from a in-memory cookie storage based on the
Private Browsing Storage Session.

* WebCore.exp.in:
Add the new WKSI functions.
* platform/mac/WebCoreSystemInterface.h:
Ditto.
* platform/mac/WebCoreSystemInterface.mm:
Ditto.

* platform/mac/CookieJar.mm:
(WebCore::cookies):
If USE(CFURLSTORAGESESSIONS) and there is a Private Browsing Cookie Storage, call into WKSI.
Otherwise, behave the same as before.
(WebCore::cookieRequestHeaderFieldValue):
Ditto.
(WebCore::setCookies):
Ditto.
(WebCore::cookiesEnabled):
Ditto
(WebCore::getRawCookies):
Ditto.
(WebCore::deleteCookie):
Ditto.

* platform/network/CookieStorage.h:
* platform/network/cf/CookieStorageCFNet.cpp:
(WebCore::privateBrowsingCookieStorage):
Keep track of the Private Browsing Cookie Storage in a locally defined static inside a
function instead of at the global scope.
(WebCore::currentCookieStorage):
Use privateBrowsingCookieStorage.
(WebCore::setCurrentCookieStorage):
Ditto.
(WebCore::setCookieStoragePrivateBrowsingEnabled):
If USE(CFURLSTORAGESESSIONS), send the Private Browsing Storage Session to
wkCreatePrivateInMemoryHTTPCookieStorage.
* platform/network/mac/CookieStorageMac.mm:
(WebCore::privateBrowsingCookieStorage):
Keep track of the Private Browsing Cookie Storage.
(WebCore::setCookieStoragePrivateBrowsingEnabled):
If USE(CFURLSTORAGESESSIONS), then set or clear privateBrowsingCookieStorage().
Added a FIXME to observe changes to the Private Browsing Cookie Storage when it is defined.

* platform/network/mac/ResourceHandleMac.mm:
(WebCore::shouldRelaxThirdPartyCookiePolicy):
Refactor the logic to determine whether or not to relax the third party cookie policy here.
If USE(CFURLSTORAGESESSIONS), then get the information from the privateBrowsingCookieStorage.
(WebCore::ResourceHandle::createNSURLConnection):
Use shouldRelaxThirdPartyCookiePolicy.
(WebCore::ResourceHandle::loadResourceSynchronously):
Ditto.

Source/WebKit/mac:

When Private Browsing is enabled, use cookies from a in-memory cookie storage based on the
Private Browsing Storage Session.

* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface):
Add support for using the new WKSI functions in WebCore.

Source/WebKit2:

When Private Browsing is enabled, use cookies from a in-memory cookie storage based on the
Private Browsing Storage Session.

* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface):
Add support for using the new WKSI functions in WebCore.

WebKitLibraries:

When Private Browsing is enabled, use cookies from a in-memory Cookie Storage based on the
Private Browsing Storage Session.

Update WebKitSystemInterface headers and libraries with the new functions.

* WebKitSystemInterface.h:
* libWebKitSystemInterfaceLeopard.a:
* libWebKitSystemInterfaceSnowLeopard.a:
* win/include/WebKitSystemInterface/WebKitSystemInterface.h:
* win/lib/WebKitSystemInterface.lib:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@80435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d2348fa5f1f00f38e5da183ca45bb7e1a2a6f398..ac92b364388554844c0439f6e38b6a9974fb11ea 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,63 @@
+2011-03-06  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        WebKit2: Use CFNetwork Sessions API.
+        https://bugs.webkit.org/show_bug.cgi?id=55435.
+
+        When Private Browsing is enabled, use cookies from a in-memory cookie storage based on the
+        Private Browsing Storage Session.
+
+        * WebCore.exp.in:
+        Add the new WKSI functions.
+        * platform/mac/WebCoreSystemInterface.h:
+        Ditto.
+        * platform/mac/WebCoreSystemInterface.mm:
+        Ditto.
+
+        * platform/mac/CookieJar.mm:
+        (WebCore::cookies):
+        If USE(CFURLSTORAGESESSIONS) and there is a Private Browsing Cookie Storage, call into WKSI.
+        Otherwise, behave the same as before.
+        (WebCore::cookieRequestHeaderFieldValue):
+        Ditto.
+        (WebCore::setCookies):
+        Ditto.
+        (WebCore::cookiesEnabled):
+        Ditto
+        (WebCore::getRawCookies):
+        Ditto.
+        (WebCore::deleteCookie):
+        Ditto.
+
+        * platform/network/CookieStorage.h:
+        * platform/network/cf/CookieStorageCFNet.cpp:
+        (WebCore::privateBrowsingCookieStorage):
+        Keep track of the Private Browsing Cookie Storage in a locally defined static inside a
+        function instead of at the global scope.
+        (WebCore::currentCookieStorage):
+        Use privateBrowsingCookieStorage.
+        (WebCore::setCurrentCookieStorage):
+        Ditto.
+        (WebCore::setCookieStoragePrivateBrowsingEnabled):
+        If USE(CFURLSTORAGESESSIONS), send the Private Browsing Storage Session to
+        wkCreatePrivateInMemoryHTTPCookieStorage.
+        * platform/network/mac/CookieStorageMac.mm:
+        (WebCore::privateBrowsingCookieStorage):
+        Keep track of the Private Browsing Cookie Storage.
+        (WebCore::setCookieStoragePrivateBrowsingEnabled):
+        If USE(CFURLSTORAGESESSIONS), then set or clear privateBrowsingCookieStorage().
+        Added a FIXME to observe changes to the Private Browsing Cookie Storage when it is defined.
+
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::shouldRelaxThirdPartyCookiePolicy):
+        Refactor the logic to determine whether or not to relax the third party cookie policy here.
+        If USE(CFURLSTORAGESESSIONS), then get the information from the privateBrowsingCookieStorage.
+        (WebCore::ResourceHandle::createNSURLConnection):
+        Use shouldRelaxThirdPartyCookiePolicy.
+        (WebCore::ResourceHandle::loadResourceSynchronously):
+        Ditto.
+
 2011-03-05  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r80428.

diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index 3465f20baf309e7b3f6880a8064e19cab9914009..596756c322f8dd4191fd4d1f481229f90da850fd 100644 (file)
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -1340,6 +1340,11 @@ _wkSignalCFReadStreamError
 _wkSignalCFReadStreamHasBytes
 _wkCreatePrivateStorageSession
 _wkCopyRequestWithStorageSession
+_wkCreatePrivateInMemoryHTTPCookieStorage
+_wkGetHTTPCookieAcceptPolicy
+_wkHTTPCookiesForURL
+_wkSetHTTPCookiesForURL
+_wkDeleteHTTPCookie
 
 #if !defined(NDEBUG)
 __ZN7WebCore20LogNotYetImplementedE

diff --git a/Source/WebCore/platform/mac/CookieJar.mm b/Source/WebCore/platform/mac/CookieJar.mm
index 2864228eb9c1e5b0c86f98b2d1d1c5f0758d0947..e7889497c2bf850958844239b1a471a11c8821ae 100644 (file)
--- a/Source/WebCore/platform/mac/CookieJar.mm
+++ b/Source/WebCore/platform/mac/CookieJar.mm
@@ -28,8 +28,10 @@
 
 #import "BlockExceptions.h"
 #import "Cookie.h"
+#import "CookieStorage.h"
 #import "Document.h"
 #import "KURL.h"
+#import "WebCoreSystemInterface.h"
 #import <wtf/RetainPtr.h>
 
 #ifdef BUILDING_ON_TIGER
@@ -79,7 +81,14 @@ String cookies(const Document*, const KURL& url)
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
     NSURL *cookieURL = url;
-    NSArray *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:cookieURL];
+    NSArray *cookies;
+#if USE(CFURLSTORAGESESSIONS)
+    if (CFHTTPCookieStorageRef cookieStorage = privateBrowsingCookieStorage().get())
+        cookies = wkHTTPCookiesForURL(cookieStorage, cookieURL);
+    else
+#endif
+        cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:cookieURL];
+
     return [[NSHTTPCookie requestHeaderFieldsWithCookies:filterCookies(cookies).get()] objectForKey:@"Cookie"];
 
     END_BLOCK_OBJC_EXCEPTIONS;
@@ -91,7 +100,14 @@ String cookieRequestHeaderFieldValue(const Document*, const KURL& url)
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
     NSURL *cookieURL = url;
-    NSArray *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:cookieURL];
+    NSArray *cookies;
+#if USE(CFURLSTORAGESESSIONS)
+    if (CFHTTPCookieStorageRef cookieStorage = privateBrowsingCookieStorage().get())
+        cookies = wkHTTPCookiesForURL(cookieStorage, cookieURL);
+    else
+#endif
+        cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:cookieURL];
+
     return [[NSHTTPCookie requestHeaderFieldsWithCookies:cookies] objectForKey:@"Cookie"];
 
     END_BLOCK_OBJC_EXCEPTIONS;
@@ -112,8 +128,14 @@ void setCookies(Document* document, const KURL& url, const String& cookieStr)
     String cookieString = cookieStr.contains('=') ? cookieStr : cookieStr + "=";
 
     NSURL *cookieURL = url;    
-    NSArray *cookies = [NSHTTPCookie cookiesWithResponseHeaderFields:[NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"] forURL:cookieURL];
-    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookies:filterCookies(cookies).get() forURL:cookieURL mainDocumentURL:document->firstPartyForCookies()];
+    RetainPtr<NSArray> filteredCookies = filterCookies([NSHTTPCookie cookiesWithResponseHeaderFields:[NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"] forURL:cookieURL]);
+
+#if USE(CFURLSTORAGESESSIONS)
+    if (CFHTTPCookieStorageRef cookieStorage = privateBrowsingCookieStorage().get())
+        wkSetHTTPCookiesForURL(cookieStorage, filteredCookies.get(), cookieURL, document->firstPartyForCookies());
+    else
+#endif
+        [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookies:filteredCookies.get() forURL:cookieURL mainDocumentURL:document->firstPartyForCookies()];
 
     END_BLOCK_OBJC_EXCEPTIONS;
 }
@@ -122,7 +144,14 @@ bool cookiesEnabled(const Document*)
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
-    NSHTTPCookieAcceptPolicy cookieAcceptPolicy = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookieAcceptPolicy];
+    NSHTTPCookieAcceptPolicy cookieAcceptPolicy;
+#if USE(CFURLSTORAGESESSIONS)
+    if (CFHTTPCookieStorageRef cookieStorage = privateBrowsingCookieStorage().get())
+        cookieAcceptPolicy = wkGetHTTPCookieAcceptPolicy(cookieStorage);
+    else
+#endif
+        cookieAcceptPolicy = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookieAcceptPolicy];
+
     return cookieAcceptPolicy == NSHTTPCookieAcceptPolicyAlways || cookieAcceptPolicy == NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
 
     END_BLOCK_OBJC_EXCEPTIONS;
@@ -135,7 +164,13 @@ bool getRawCookies(const Document*, const KURL& url, Vector<Cookie>& rawCookies)
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
     NSURL *cookieURL = url;
-    NSArray *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:cookieURL];
+    NSArray *cookies;
+#if USE(CFURLSTORAGESESSIONS)
+    if (CFHTTPCookieStorageRef cookieStorage = privateBrowsingCookieStorage().get())
+        cookies = wkHTTPCookiesForURL(cookieStorage, cookieURL);
+    else
+#endif
+        cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:cookieURL];
 
     NSUInteger count = [cookies count];
     rawCookies.reserveCapacity(count);
@@ -162,14 +197,27 @@ void deleteCookie(const Document*, const KURL& url, const String& cookieName)
 
     NSURL *cookieURL = url;
     NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
-    NSArray *cookies = [cookieStorage cookiesForURL:cookieURL];
+    NSArray *cookies;
+#if USE(CFURLSTORAGESESSIONS)
+    CFHTTPCookieStorageRef cfCookieStorage = privateBrowsingCookieStorage().get();
+    if (cfCookieStorage)
+        cookies = wkHTTPCookiesForURL(cfCookieStorage, cookieURL);
+    else
+#endif
+        cookies = [cookieStorage cookiesForURL:cookieURL];
+
     NSString *cookieNameString = (NSString *) cookieName;
 
     NSUInteger count = [cookies count];
     for (NSUInteger i = 0; i < count; ++i) {
         NSHTTPCookie *cookie = (NSHTTPCookie *)[cookies objectAtIndex:i];
         if ([[cookie name] isEqualToString:cookieNameString]) {
-            [cookieStorage deleteCookie:cookie];
+#if USE(CFURLSTORAGESESSIONS)
+            if (cfCookieStorage)
+                wkDeleteHTTPCookie(cfCookieStorage, cookie);
+            else
+#endif
+                [cookieStorage deleteCookie:cookie];
             break;
         }
     }

diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.h b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
index a175f5e50e7739ddade615a8e9ad1605d298b015..df65ff2d7a07ac5376a27a086ee9356ef0e9c14c 100644 (file)
--- a/Source/WebCore/platform/mac/WebCoreSystemInterface.h
+++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
@@ -50,11 +50,13 @@ typedef struct _NSRect NSRect;
 @class NSDate;
 @class NSEvent;
 @class NSFont;
+@class NSHTTPCookie;
 @class NSImage;
 @class NSMenu;
 @class NSMutableURLRequest;
 @class NSString;
 @class NSTextFieldCell;
+@class NSURL;
 @class NSURLConnection;
 @class NSURLRequest;
 @class NSURLResponse;
@@ -68,10 +70,12 @@ class NSData;
 class NSDate;
 class NSEvent;
 class NSFont;
+class NSHTTPCookie;
 class NSImage;
 class NSMenu;
 class NSMutableArray;
 class NSMutableURLRequest;
+class NSURL;
 class NSURLRequest;
 class NSString;
 class NSTextFieldCell;
@@ -239,6 +243,13 @@ typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
 extern CFURLStorageSessionRef (*wkCreatePrivateStorageSession)(CFStringRef);
 extern NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*);
 
+typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
+extern CFHTTPCookieStorageRef (*wkCreatePrivateInMemoryHTTPCookieStorage)(CFURLStorageSessionRef);
+extern unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
+extern NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *);
+extern void (*wkSetHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
+extern void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);
+
 }
 
 #endif

diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.mm b/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
index beba334471bd0e1629ccb2a0c451794a409d4989..50ac23638d05b6ff97ce1072504832538ecbcea4 100644 (file)
--- a/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
+++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
@@ -174,3 +174,8 @@ AXUIElementRef (*wkCreateAXUIElementRef)(id element);
 
 CFURLStorageSessionRef (*wkCreatePrivateStorageSession)(CFStringRef);
 NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*);
+CFHTTPCookieStorageRef (*wkCreatePrivateInMemoryHTTPCookieStorage)(CFURLStorageSessionRef);
+unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
+NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *);
+void (*wkSetHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
+void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);

diff --git a/Source/WebCore/platform/network/CookieStorage.h b/Source/WebCore/platform/network/CookieStorage.h
index 8876af8f1cedb746b72b9fcb2f36fd7f33d07549..67bb4d586988cc27632abbf0a356c89da814d71d 100644 (file)
--- a/Source/WebCore/platform/network/CookieStorage.h
+++ b/Source/WebCore/platform/network/CookieStorage.h
@@ -26,8 +26,17 @@
 #ifndef CookieStorage_h
 #define CookieStorage_h
 
+#include <wtf/RetainPtr.h>
+
+typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
+
 namespace WebCore {
 
+
+#if USE(CFURLSTORAGESESSIONS) && PLATFORM(MAC)
+RetainPtr<CFHTTPCookieStorageRef>& privateBrowsingCookieStorage();
+#endif
+
 void setCookieStoragePrivateBrowsingEnabled(bool);
 void startObservingCookieChanges();
 void stopObservingCookieChanges();

diff --git a/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp b/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
index b50d58aeafac95e62d8b89dc061c52791dbd6635..c2a5691dfb123e85dd16b8d6d3b4a17d4b0d04d9 100644 (file)
--- a/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
+++ b/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
@@ -29,6 +29,7 @@
 #if USE(CFNETWORK)
 
 #include "LoaderRunLoopCF.h"
+#include "ResourceHandle.h"
 #include <CFNetwork/CFHTTPCookiesPriv.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <wtf/MainThread.h>
@@ -41,14 +42,18 @@
 
 namespace WebCore {
 
-static CFHTTPCookieStorageRef s_cookieStorage;
+static RetainPtr<CFHTTPCookieStorageRef>& privateBrowsingCookieStorage()
+{
+    DEFINE_STATIC_LOCAL(RetainPtr<CFHTTPCookieStorageRef>, cookieStorage, ());
+    return cookieStorage;
+}
 
 CFHTTPCookieStorageRef currentCookieStorage()
 {
     ASSERT(isMainThread());
 
-    if (s_cookieStorage)
-        return s_cookieStorage;
+    if (CFHTTPCookieStorageRef privateCookieStorage = privateBrowsingCookieStorage().get())
+        return privateCookieStorage;
     return wkGetDefaultHTTPCookieStorage();
 }
 
@@ -56,24 +61,23 @@ void setCurrentCookieStorage(CFHTTPCookieStorageRef cookieStorage)
 {
     ASSERT(isMainThread());
 
-    CFRetain(cookieStorage);
-    if (s_cookieStorage)
-        CFRelease(s_cookieStorage);
-
-    s_cookieStorage = cookieStorage;
+    privateBrowsingCookieStorage().adoptCF(cookieStorage);
 }
 
 void setCookieStoragePrivateBrowsingEnabled(bool enabled)
 {
     ASSERT(isMainThread());
 
-    if (s_cookieStorage)
-        CFRelease(s_cookieStorage);
+    if (!enabled) {
+        privateBrowsingCookieStorage() = nullptr;
+        return;
+    }
 
-    if (enabled)
-        s_cookieStorage = wkCreatePrivateHTTPCookieStorage();
-    else
-        s_cookieStorage = 0;
+#if USE(CFURLSTORAGESESSIONS)
+    privateBrowsingCookieStorage().adoptCF(wkCreatePrivateInMemoryHTTPCookieStorage(ResourceHandle::privateBrowsingStorageSession()));
+#else
+    privateBrowsingCookieStorage().adoptCF(wkCreatePrivateInMemoryHTTPCookieStorage(0));
+#endif
 }
 
 static void notifyCookiesChangedOnMainThread(void* context)

diff --git a/Source/WebCore/platform/network/mac/CookieStorageMac.mm b/Source/WebCore/platform/network/mac/CookieStorageMac.mm
index 8b77ffea13db9ce0b7c2260264c44aad035c01d5..db64aaea0c5f90377920e93ff067848e6bf4aad3 100644 (file)
--- a/Source/WebCore/platform/network/mac/CookieStorageMac.mm
+++ b/Source/WebCore/platform/network/mac/CookieStorageMac.mm
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "CookieStorage.h"
 
+#import "ResourceHandle.h"
 #import "WebCoreSystemInterface.h"
 #import <wtf/RetainPtr.h>
 #import <wtf/UnusedParam.h>
@@ -74,8 +75,33 @@ using namespace WebCore;
 
 namespace WebCore {
 
+#if USE(CFURLSTORAGESESSIONS)
+
+RetainPtr<CFHTTPCookieStorageRef>& privateBrowsingCookieStorage()
+{
+    DEFINE_STATIC_LOCAL(RetainPtr<CFHTTPCookieStorageRef>, cookieStorage, ());
+    return cookieStorage;
+}
+
+#endif
+
 void setCookieStoragePrivateBrowsingEnabled(bool enabled)
 {
+#if USE(CFURLSTORAGESESSIONS)
+    if (enabled && privateBrowsingCookieStorage())
+        return;
+
+    if (enabled && ResourceHandle::privateBrowsingStorageSession()) {
+        privateBrowsingCookieStorage().adoptCF(wkCreatePrivateInMemoryHTTPCookieStorage(ResourceHandle::privateBrowsingStorageSession()));
+
+        // FIXME: When Private Browsing is enabled, the Private Browsing Cookie Storage should be
+        // observed for changes, not the default Cookie Storage.
+
+        return;
+    }
+
+    privateBrowsingCookieStorage() = nullptr;
+#endif
     wkSetCookieStoragePrivateBrowsingEnabled(enabled);
 }
 

diff --git a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
index ae90e068479c360069a04bd03c4dfb8ee6ebcfde..96d561d9041231d5245d7cc82e456a85c2e104dd 100644 (file)
--- a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
+++ b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
@@ -33,6 +33,7 @@
 #import "Base64.h"
 #import "BlobRegistry.h"
 #import "BlockExceptions.h"
+#import "CookieStorage.h"
 #import "CredentialStorage.h"
 #import "CachedResourceLoader.h"
 #import "EmptyProtocolDefinitions.h"
@@ -186,6 +187,35 @@ bool ResourceHandle::didSendBodyDataDelegateExists()
     return NSFoundationVersionNumber > MaxFoundationVersionWithoutdidSendBodyDataDelegate;
 }
 
+static bool shouldRelaxThirdPartyCookiePolicy(const KURL& url)
+{
+    // If a URL already has cookies, then we'll relax the 3rd party cookie policy and accept new cookies.
+
+    NSHTTPCookieStorage *sharedStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+
+    NSHTTPCookieAcceptPolicy cookieAcceptPolicy;
+#if USE(CFURLSTORAGESESSIONS)
+    CFHTTPCookieStorageRef cfPrivateBrowsingStorage = privateBrowsingCookieStorage().get();
+    if (cfPrivateBrowsingStorage)
+        cookieAcceptPolicy =  wkGetHTTPCookieAcceptPolicy(cfPrivateBrowsingStorage);
+    else
+#endif
+        cookieAcceptPolicy = [sharedStorage cookieAcceptPolicy];
+
+    if (cookieAcceptPolicy != NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
+        return false;
+
+    NSArray *cookies;
+#if USE(CFURLSTORAGESESSIONS)
+    if (cfPrivateBrowsingStorage)
+        cookies = wkHTTPCookiesForURL(cfPrivateBrowsingStorage, url);
+    else
+#endif
+        cookies = [sharedStorage cookiesForURL:url];
+
+    return [cookies count];
+}
+
 void ResourceHandle::createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff)
 {
     // Credentials for ftp can only be passed in URL, the connection:didReceiveAuthenticationChallenge: delegate call won't be made.
@@ -200,9 +230,7 @@ void ResourceHandle::createNSURLConnection(id delegate, bool shouldUseCredential
         firstRequest().setURL(urlWithCredentials);
     }
 
-    // If a URL already has cookies, then we'll relax the 3rd party cookie policy and accept new cookies.
-    NSHTTPCookieStorage *sharedStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
-    if ([sharedStorage cookieAcceptPolicy] == NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain && [[sharedStorage cookiesForURL:firstRequest().url()] count])
+    if (shouldRelaxThirdPartyCookiePolicy(firstRequest().url()))
         firstRequest().setFirstPartyForCookies(firstRequest().url());
 
 #if !defined(BUILDING_ON_TIGER)
@@ -511,9 +539,7 @@ void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const
     UNUSED_PARAM(context);
     NSURLRequest *firstRequest = request.nsURLRequest();
 
-    // If a URL already has cookies, then we'll relax the 3rd party cookie policy and accept new cookies.
-    NSHTTPCookieStorage *sharedStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
-    if ([sharedStorage cookieAcceptPolicy] == NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain && [[sharedStorage cookiesForURL:[firstRequest URL]] count]) {
+    if (shouldRelaxThirdPartyCookiePolicy([firstRequest URL])) {
         NSMutableURLRequest *mutableRequest = [[firstRequest mutableCopy] autorelease];
         [mutableRequest setMainDocumentURL:[mutableRequest URL]];
         firstRequest = mutableRequest;

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 9df8bcf16bea191dfd3aadf66dac360a086d4bb5..a8acb67053e127d09ca4d73d052a031b81eb2602 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2011-03-06  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        WebKit2: Use CFNetwork Sessions API.
+        https://bugs.webkit.org/show_bug.cgi?id=55435.
+
+        When Private Browsing is enabled, use cookies from a in-memory cookie storage based on the
+        Private Browsing Storage Session.
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+        Add support for using the new WKSI functions in WebCore.
+
 2011-03-05  Ilya Sherman  <isherman@chromium.org>
 
         Reviewed by Darin Adler.

diff --git a/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm b/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
index ff1073d14993db2cb0663b87db007c8e88183f32..6504f17afef95122bb3c9e5a6f4c362f8df88f21 100644 (file)
--- a/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
@@ -168,6 +168,11 @@ void InitWebCoreSystemInterface(void)
     INIT(UnregisterUniqueIdForElement);
     INIT(CreatePrivateStorageSession);
     INIT(CopyRequestWithStorageSession);
+    INIT(CreatePrivateInMemoryHTTPCookieStorage);
+    INIT(GetHTTPCookieAcceptPolicy);
+    INIT(HTTPCookiesForURL);
+    INIT(SetHTTPCookiesForURL);
+    INIT(DeleteHTTPCookie);
 
     didInit = true;
 }

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 751782eb798bc3ca2d98e7be9669f79b201efe97..0e19ed0f9c55418eb19258f92d63521051af521b 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2011-03-06  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        WebKit2: Use CFNetwork Sessions API.
+        https://bugs.webkit.org/show_bug.cgi?id=55435.
+
+        When Private Browsing is enabled, use cookies from a in-memory cookie storage based on the
+        Private Browsing Storage Session.
+
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+        Add support for using the new WKSI functions in WebCore.
+
 2011-03-06  Oleg Romashin  <romaxa@gmail.com>
 
         Reviewed by Kenneth Rohde Christiansen.

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm b/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
index 36f72ba6a1c72e503f330a6dd45506b7ca69d925..2c8649ebc6144d5272db12e81e87b81a1d026e96 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
@@ -95,6 +95,11 @@ void InitWebCoreSystemInterface(void)
         INIT(SignalCFReadStreamHasBytes);
         INIT(CreatePrivateStorageSession);
         INIT(CopyRequestWithStorageSession);
+        INIT(CreatePrivateInMemoryHTTPCookieStorage);
+        INIT(GetHTTPCookieAcceptPolicy);
+        INIT(HTTPCookiesForURL);
+        INIT(SetHTTPCookiesForURL);
+        INIT(DeleteHTTPCookie);
 
 #if !defined(BUILDING_ON_SNOW_LEOPARD)
         INIT(IOSurfaceContextCreate);

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index d89e9dac1320a8316562e1d25c9b15d99c171bde..114cb7068df545bc65cdd5f1d41cf8ad5c7c83d2 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,21 @@
+2011-03-06  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        WebKit2: Use CFNetwork Sessions API.
+        https://bugs.webkit.org/show_bug.cgi?id=55435.
+
+        When Private Browsing is enabled, use cookies from a in-memory Cookie Storage based on the
+        Private Browsing Storage Session.
+
+        Update WebKitSystemInterface headers and libraries with the new functions.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+
 2011-03-04  Jessie Berlin  <jberlin@apple.com>
 
         Reviewed by Maciej Stachowiak.

diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index cd5281fcf374bc4321a4642d0419740849190fb0..4d6703ca39aa2365c8e56bcd92663450b04fd4f2 100644 (file)
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -238,6 +238,13 @@ CFURLStorageSessionRef WKCreatePrivateStorageSession(CFStringRef);
 NSURLRequest *WKCopyRequestWithStorageSession(CFURLStorageSessionRef, NSURLRequest*);
 NSCachedURLResponse *WKCachedResponseForRequest(CFURLStorageSessionRef, NSURLRequest*);
 
+typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
+CFHTTPCookieStorageRef WKCreatePrivateInMemoryHTTPCookieStorage(CFURLStorageSessionRef);
+unsigned WKGetHTTPCookieAcceptPolicy(CFHTTPCookieStorageRef);
+NSArray *WKHTTPCookiesForURL(CFHTTPCookieStorageRef, NSURL *);
+void WKSetHTTPCookiesForURL(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
+void WKDeleteHTTPCookie(CFHTTPCookieStorageRef, NSHTTPCookie *);
+
 void WKSetVisibleApplicationName(CFStringRef);
 
 typedef enum {

diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
index c62157965c502a26e737cd910f39943be4176c5f..d52ce7f8ea42f792762280199b1de97cfd3feb31 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ

diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
index dbda67e5d2674128d50cf432e70dd9b4d3a958db..e54b84403318d7f7dafb6d130514b92e19ad6d71 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ

diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 28b27041068ff3e93f97368de2c7b13726b05e8e..5d17561da017b8d1538cc39e3191c344059cccd2 100644 (file)
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -89,7 +89,7 @@ CFDictionaryRef wkGetSSLCertificateInfo(CFURLResponseRef);
 void* wkGetSSLPeerCertificateData(CFDictionaryRef);
 void* wkGetSSLCertificateChainContext(CFDictionaryRef);
 CFHTTPCookieStorageRef wkGetDefaultHTTPCookieStorage();
-CFHTTPCookieStorageRef wkCreatePrivateHTTPCookieStorage();
+CFHTTPCookieStorageRef wkCreatePrivateInMemoryHTTPCookieStorage(CFURLStorageSessionRef);
 void wkSetCFURLRequestShouldContentSniff(CFMutableURLRequestRef, bool);
 CFStringRef wkCopyFoundationCacheDirectory();
 void wkSetClientCertificateInSSLProperties(CFMutableDictionaryRef, CFDataRef);

diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index 50e54439bd9929924de1a2828824dfa8010076be..c6fe998669f57cebac080a78360030c624281f8a 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ