diff options
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]; } |