Title: [91201] trunk/Source/WebCore
- Revision
- 91201
- Author
- [email protected]
- Date
- 2011-07-18 12:20:55 -0700 (Mon, 18 Jul 2011)
Log Message
Unreviewed. Fix Windows build. Move static function defaultSessionCookieStorage() to before
its use in defaultCookieStorage().
* platform/network/cf/CookieStorageCFNet.cpp:
(WebCore::defaultSessionCookieStorage):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91200 => 91201)
--- trunk/Source/WebCore/ChangeLog 2011-07-18 18:55:56 UTC (rev 91200)
+++ trunk/Source/WebCore/ChangeLog 2011-07-18 19:20:55 UTC (rev 91201)
@@ -1,5 +1,13 @@
2011-07-18 Pratik Solanki <[email protected]>
+ Unreviewed. Fix Windows build. Move static function defaultSessionCookieStorage() to before
+ its use in defaultCookieStorage().
+
+ * platform/network/cf/CookieStorageCFNet.cpp:
+ (WebCore::defaultSessionCookieStorage):
+
+2011-07-18 Pratik Solanki <[email protected]>
+
Part of https://bugs.webkit.org/show_bug.cgi?id=63674
Get webkit to compile with USE(CFNETWORK) enabled on Mac
Modified: trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp (91200 => 91201)
--- trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2011-07-18 18:55:56 UTC (rev 91200)
+++ trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2011-07-18 19:20:55 UTC (rev 91201)
@@ -65,6 +65,18 @@
#endif
+#if USE(CFNETWORK) && PLATFORM(WIN)
+static RetainPtr<CFHTTPCookieStorageRef>& defaultSessionCookieStorage()
+{
+ DEFINE_STATIC_LOCAL(RetainPtr<CFHTTPCookieStorageRef>, cookieStorage, ());
+#if USE(CFURLSTORAGESESSIONS)
+ if (!cookieStorage && ResourceHandle::defaultStorageSession())
+ cookieStorage.adoptCF(wkCopyHTTPCookieStorage(ResourceHandle::defaultStorageSession()));
+#endif
+ return cookieStorage;
+}
+#endif
+
#if USE(CFNETWORK)
CFHTTPCookieStorageRef defaultCookieStorage()
@@ -89,16 +101,6 @@
#if USE(CFNETWORK) && PLATFORM(WIN)
-static RetainPtr<CFHTTPCookieStorageRef>& defaultSessionCookieStorage()
-{
- DEFINE_STATIC_LOCAL(RetainPtr<CFHTTPCookieStorageRef>, cookieStorage, ());
-#if USE(CFURLSTORAGESESSIONS)
- if (!cookieStorage && ResourceHandle::defaultStorageSession())
- cookieStorage.adoptCF(wkCopyHTTPCookieStorage(ResourceHandle::defaultStorageSession()));
-#endif
- return cookieStorage;
-}
-
void setCurrentCookieStorage(CFHTTPCookieStorageRef cookieStorage)
{
ASSERT(isMainThread());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
