Remove global initializer in CookieStorageCFNet.cpp

[WebKit-https.git] / Source / WebCore / platform / network / cf / CookieStorageCFNet.cpp

diff --git a/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp b/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
index 3deb688d077621ec65a2f612fc41723155036c35..13e745161bb00a84a49ed765d5da1ca016739b18 100644 (file)
--- a/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
+++ b/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
@@ -35,14 +35,14 @@
 
 namespace WebCore {
 
-static RetainPtr<CFHTTPCookieStorageRef> s_cookieStorage;
+static CFHTTPCookieStorageRef s_cookieStorage;
 
 CFHTTPCookieStorageRef currentCookieStorage()
 {
     ASSERT(isMainThread());
 
     if (s_cookieStorage)
-        return s_cookieStorage.get();
+        return s_cookieStorage;
     return wkGetDefaultHTTPCookieStorage();
 }
 
@@ -50,6 +50,10 @@ void setCurrentCookieStorage(CFHTTPCookieStorageRef cookieStorage)
 {
     ASSERT(isMainThread());
 
+    CFRetain(cookieStorage);
+    if (s_cookieStorage)
+        CFRelease(s_cookieStorage);
+
     s_cookieStorage = cookieStorage;
 }
 
@@ -57,8 +61,11 @@ void setCookieStoragePrivateBrowsingEnabled(bool enabled)
 {
     ASSERT(isMainThread());
 
+    if (s_cookieStorage)
+        CFRelease(s_cookieStorage);
+
     if (enabled)
-        s_cookieStorage.adoptCF(wkCreatePrivateHTTPCookieStorage());
+        s_cookieStorage = wkCreatePrivateHTTPCookieStorage();
     else
         s_cookieStorage = 0;
 }