Changeset 93999 in webkit

Timestamp:

Aug 29, 2011, 12:07:27 PM (15 years ago)

Author:

ap@apple.com

Message:

Windows build fix.

WebKit/win:

• WebView.cpp: (updateSharedSettingsFromPreferencesIfNeeded): Updated for new function name and signature: currentCFHTTPCookieStorage().

WebKit2:

• WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp: (WebKit::WebCookieManager::platformSetHTTPCookieAcceptPolicy): (WebKit::WebCookieManager::platformGetHTTPCookieAcceptPolicy): Updated for new function name and signature: currentCFHTTPCookieStorage().

Location:

trunk/Source

Files:

• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp (modified) (1 diff)

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2011-08-29  Alexey Proskuryakov  <ap@apple.com>
+
+        Windows build fix.
+
+        * WebView.cpp:
+        (updateSharedSettingsFromPreferencesIfNeeded):
+        Updated for new function name and signature: currentCFHTTPCookieStorage().
+
 2011-08-26  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit/win/WebView.cpp

@@ -4911 +4911 @@
 #if USE(CFNETWORK)
     // Set cookie storage accept policy
-    if (CFHTTPCookieStorageRef cookieStorage = currentCookieStorage())
-        CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage, acceptPolicy);
+    if (RetainPtr<CFHTTPCookieStorageRef> cookieStorage = currentCFHTTPCookieStorage())
+        CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), acceptPolicy);
 #endif
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-08-29  Alexey Proskuryakov  <ap@apple.com>
+
+        Windows build fix.
+
+        * WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp:
+        (WebKit::WebCookieManager::platformSetHTTPCookieAcceptPolicy):
+        (WebKit::WebCookieManager::platformGetHTTPCookieAcceptPolicy):
+        Updated for new function name and signature: currentCFHTTPCookieStorage().
+
 2011-08-26  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp

@@ -37 +37 @@
     CFHTTPCookieStorageSetCookieAcceptPolicy(WebCore::defaultCookieStorage(), policy);
 
-    CFHTTPCookieStorageRef privateBrowsingCookieStorage = WebCore::privateBrowsingCookieStorage().get();
+    RetainPtr<CFHTTPCookieStorageRef> cookieStorage = WebCore::currentCFHTTPCookieStorage();
     if (!privateBrowsingCookieStorage)
         return;
-    CFHTTPCookieStorageSetCookieAcceptPolicy(privateBrowsingCookieStorage, policy);
+    CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy);
 }
 
 HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
 {
-    return CFHTTPCookieStorageGetCookieAcceptPolicy(WebCore::currentCookieStorage());
+    RetainPtr<CFHTTPCookieStorageRef> cookieStorage = WebCore::currentCFHTTPCookieStorage();
+    return CFHTTPCookieStorageGetCookieAcceptPolicy(cookieStorage.get());
 }