From 1406077f3dce58d4b9c2d4da9fe8570402205508 Mon Sep 17 00:00:00 2001
From: "psolanki@apple.com"
 <psolanki@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue, 22 Feb 2011 00:13:58 +0000
Subject: [PATCH] Remove global initializer in CookieStorageCFNet.cpp
 https://bugs.webkit.org/show_bug.cgi?id=54905

Reviewed by Darin Adler.

* platform/network/cf/CookieStorageCFNet.cpp:
(WebCore::currentCookieStorage):
(WebCore::setCurrentCookieStorage):
(WebCore::setCookieStoragePrivateBrowsingEnabled):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@79261 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Source/WebCore/ChangeLog                                  | 12 ++++++++++++
 Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp | 13 ++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b45bf45..a783ab0 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-21  Pratik Solanki  <psolanki@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Remove global initializer in CookieStorageCFNet.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=54905
+
+        * platform/network/cf/CookieStorageCFNet.cpp:
+        (WebCore::currentCookieStorage):
+        (WebCore::setCurrentCookieStorage):
+        (WebCore::setCookieStoragePrivateBrowsingEnabled):
+
 2011-02-18  Jer Noble  <jer.noble@apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp b/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
index 3deb688..13e7451 100644
--- 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;
 }
-- 
1.8.3.1