diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/network/mac/CookieStorageMac.mm | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/network/mac/CookieStorageMac.mm')
| -rw-r--r-- | Source/WebCore/platform/network/mac/CookieStorageMac.mm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebCore/platform/network/mac/CookieStorageMac.mm b/Source/WebCore/platform/network/mac/CookieStorageMac.mm index db64aae..2696188 100644 --- a/Source/WebCore/platform/network/mac/CookieStorageMac.mm +++ b/Source/WebCore/platform/network/mac/CookieStorageMac.mm @@ -92,7 +92,7 @@ void setCookieStoragePrivateBrowsingEnabled(bool enabled) return; if (enabled && ResourceHandle::privateBrowsingStorageSession()) { - privateBrowsingCookieStorage().adoptCF(wkCreatePrivateInMemoryHTTPCookieStorage(ResourceHandle::privateBrowsingStorageSession())); + privateBrowsingCookieStorage().adoptCF(wkCopyHTTPCookieStorage(ResourceHandle::privateBrowsingStorageSession())); // FIXME: When Private Browsing is enabled, the Private Browsing Cookie Storage should be // observed for changes, not the default Cookie Storage. @@ -116,7 +116,10 @@ void startObservingCookieChanges() void stopObservingCookieChanges() { - ASSERT(cookieStorageAdapter); + // cookieStorageAdapter can be nil here, if the WebProcess crashed and was restarted between + // when startObservingCookieChanges was called, and stopObservingCookieChanges is currently being called. + if (!cookieStorageAdapter) + return; [cookieStorageAdapter stopListeningForCookieChangeNotifications]; } |