Title: [93999] trunk/Source
- Revision
- 93999
- Author
- [email protected]
- Date
- 2011-08-29 12:07:27 -0700 (Mon, 29 Aug 2011)
Log 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().
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (93998 => 93999)
--- trunk/Source/WebKit/win/ChangeLog 2011-08-29 18:59:15 UTC (rev 93998)
+++ trunk/Source/WebKit/win/ChangeLog 2011-08-29 19:07:27 UTC (rev 93999)
@@ -1,3 +1,11 @@
+2011-08-29 Alexey Proskuryakov <[email protected]>
+
+ Windows build fix.
+
+ * WebView.cpp:
+ (updateSharedSettingsFromPreferencesIfNeeded):
+ Updated for new function name and signature: currentCFHTTPCookieStorage().
+
2011-08-26 Alexey Proskuryakov <[email protected]>
DumpRenderTree should begin each test with an empty cookie store
Modified: trunk/Source/WebKit/win/WebView.cpp (93998 => 93999)
--- trunk/Source/WebKit/win/WebView.cpp 2011-08-29 18:59:15 UTC (rev 93998)
+++ trunk/Source/WebKit/win/WebView.cpp 2011-08-29 19:07:27 UTC (rev 93999)
@@ -4910,8 +4910,8 @@
#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
return S_OK;
Modified: trunk/Source/WebKit2/ChangeLog (93998 => 93999)
--- trunk/Source/WebKit2/ChangeLog 2011-08-29 18:59:15 UTC (rev 93998)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-29 19:07:27 UTC (rev 93999)
@@ -1,3 +1,12 @@
+2011-08-29 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
DumpRenderTree should begin each test with an empty cookie store
Modified: trunk/Source/WebKit2/WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp (93998 => 93999)
--- trunk/Source/WebKit2/WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp 2011-08-29 18:59:15 UTC (rev 93998)
+++ trunk/Source/WebKit2/WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp 2011-08-29 19:07:27 UTC (rev 93999)
@@ -36,15 +36,16 @@
{
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());
}
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
